* [patch] rocker: fix an error code
@ 2016-02-27 11:31 Dan Carpenter
2016-02-27 11:38 ` Jiri Pirko
2016-02-27 19:06 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2016-02-27 11:31 UTC (permalink / raw)
To: Jiri Pirko, Ying Xue; +Cc: Scott Feldman, netdev, kernel-janitors
We intended to return PTR_ERR() here instead of 1.
Fixes: 1f9993f6825f ('rocker: fix a neigh entry leak issue')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
We recently moved rocker files around so this only applies to -next.
Probably returning the wrong error code is harmless.
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c
index 099008a..07218c3 100644
--- a/drivers/net/ethernet/rocker/rocker_ofdpa.c
+++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@ -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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch] rocker: fix an error code
2016-02-27 11:31 [patch] rocker: fix an error code Dan Carpenter
@ 2016-02-27 11:38 ` Jiri Pirko
2016-02-27 19:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2016-02-27 11:38 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Ying Xue, Scott Feldman, netdev, kernel-janitors
Sat, Feb 27, 2016 at 12:31:43PM CET, dan.carpenter@oracle.com 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 <dan.carpenter@oracle.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] rocker: fix an error code
2016-02-27 11:31 [patch] rocker: fix an error code Dan Carpenter
2016-02-27 11:38 ` Jiri Pirko
@ 2016-02-27 19:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-02-27 19:06 UTC (permalink / raw)
To: dan.carpenter; +Cc: jiri, ying.xue, sfeldma, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Sat, 27 Feb 2016 14:31:43 +0300
> We intended to return PTR_ERR() here instead of 1.
>
> Fixes: 1f9993f6825f ('rocker: fix a neigh entry leak issue')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-27 19:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-27 11:31 [patch] rocker: fix an error code Dan Carpenter
2016-02-27 11:38 ` Jiri Pirko
2016-02-27 19:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox