From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jiri Pirko <jiri@resnulli.us>, Ying Xue <ying.xue@windriver.com>
Cc: Scott Feldman <sfeldma@gmail.com>,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] rocker: fix an error code
Date: Sat, 27 Feb 2016 11:31:43 +0000 [thread overview]
Message-ID: <20160227113143.GA19177@mwanda> (raw)
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
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jiri Pirko <jiri@resnulli.us>, Ying Xue <ying.xue@windriver.com>
Cc: Scott Feldman <sfeldma@gmail.com>,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [patch] rocker: fix an error code
Date: Sat, 27 Feb 2016 14:31:43 +0300 [thread overview]
Message-ID: <20160227113143.GA19177@mwanda> (raw)
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
next reply other threads:[~2016-02-27 11:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-27 11:31 Dan Carpenter [this message]
2016-02-27 11:31 ` [patch] rocker: fix an error code Dan Carpenter
2016-02-27 11:38 ` Jiri Pirko
2016-02-27 11:38 ` Jiri Pirko
2016-02-27 19:06 ` David Miller
2016-02-27 19:06 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160227113143.GA19177@mwanda \
--to=dan.carpenter@oracle.com \
--cc=jiri@resnulli.us \
--cc=kernel-janitors@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfeldma@gmail.com \
--cc=ying.xue@windriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.