aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/rocker/rocker_ofdpa.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-02-27 14:31:43 +0300
committerDavid S. Miller <davem@davemloft.net>2016-02-27 14:06:14 -0500
commitf73e0c24bf075cf934e73133f5e89052afac1d32 (patch)
treead7c9a3a7c0d2136fcbda17a8b88c30888f4a9d8 /drivers/net/ethernet/rocker/rocker_ofdpa.c
parentMerge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (diff)
downloadlinux-dev-f73e0c24bf075cf934e73133f5e89052afac1d32.tar.xz
linux-dev-f73e0c24bf075cf934e73133f5e89052afac1d32.zip
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 <dan.carpenter@oracle.com> Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rocker/rocker_ofdpa.c')
-rw-r--r--drivers/net/ethernet/rocker/rocker_ofdpa.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c
index 099008a53b03..07218c360d86 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