rocker: fix an error code

PATCH Applied Dan Carpenter 3 participants 3 messages Feb 27, 2016

Subsystems (4)

Networking Network drivers Kernel janitors Rocker driver

lore

Share & tools

lore

Dan Carpenter

author

2016-02-27 11:31 UTC #0 lore raw

PATCH 1/1 rocker: fix an error code

We intended to return PTR_ERR() here instead of 1.

Fixes 1f9993f6825f ('rocker: fix a neigh entry leak issue')

Signed-off-by Dan Carpenter <[email protected]>

---
We recently moved rocker files around so this only applies to -next. Probably returning the wrong error code is harmless.

drivers/net/ethernet/rocker/rocker_ofdpa.c +1 -1

index 099008a..07218c3 100644
@@ -1449,7 +1449,7 @@ static int ofdpa_port_ipv4_resolve(struct ofdpa_port *ofdpa_port,
 	if (!n) {
 		n = neigh_create(&arp_tbl, &ip_addr, dev);
 		if (IS_ERR(n))
-			return IS_ERR(n);
+			return PTR_ERR(n);
 	}
 
 	/* If the neigh is already resolved, then go ahead and

Jiri Pirko

maintainer Acked-by on v1 1/1

2016-02-27 11:38 UTC #1 lore raw

Quoted 4 lines · Sat, Feb 27, 2016 at 12:31:43PM CET, [email protected] wrote:

We intended to return PTR_ERR() here instead of 1.
Fixes 1f9993f6825f ('rocker: fix a neigh entry leak issue')
Signed-off-by Dan Carpenter <[email protected]>

Acked-by Jiri Pirko <[email protected]>

David Miller

maintainer Applied

2016-02-27 19:06 UTC #2 lore raw

In reply to Dan Carpenter

From: Dan Carpenter <[email protected]>
Date: Sat, 27 Feb 2016 14:31:43 +0300

Quoted 4 lines

We intended to return PTR_ERR() here instead of 1.
Fixes 1f9993f6825f ('rocker: fix a neigh entry leak issue')
Signed-off-by Dan Carpenter <[email protected]>

Applied, thanks.