| Message ID | 20160227113143.GA19177@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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>
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.
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
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.