[PATCH net-next] rtnetlink: Drop unnecessary return value from ndo_dflt_fdb_del

[PATCH net-next] rtnetlink: Drop unnecessary return value from ndo_dflt_fdb_del

[Alexander Duyck]

This change cleans up ndo_dflt_fdb_del to drop the ENOTSUPP return value since
that isn't actually returned anywhere in the code.  As a result we are able to
drop a few lines by just defaulting this to -EINVAL.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
---
 net/core/rtnetlink.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 1f8a59e..ad00c35 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2388,22 +2388,20 @@ int ndo_dflt_fdb_del(struct ndmsg *ndm,
 		     struct net_device *dev,
 		     const unsigned char *addr)
 {
-	int err = -EOPNOTSUPP;
+	int err = -EINVAL;
 
 	/* If aging addresses are supported device will need to
 	 * implement its own handler for this.
 	 */
 	if (!(ndm->ndm_state & NUD_PERMANENT)) {
 		pr_info("%s: FDB only supports static addresses\n", dev->name);
-		return -EINVAL;
+		return err;
 	}
 
 	if (is_unicast_ether_addr(addr) || is_link_local_ether_addr(addr))
 		err = dev_uc_del(dev, addr);
 	else if (is_multicast_ether_addr(addr))
 		err = dev_mc_del(dev, addr);
-	else
-		err = -EINVAL;
 
 	return err;
 }

Re: [PATCH net-next] rtnetlink: Drop unnecessary return value from ndo_dflt_fdb_del

[David Miller]

From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Tue, 15 Jul 2014 15:15:20 -0700

> This change cleans up ndo_dflt_fdb_del to drop the ENOTSUPP return value since
> that isn't actually returned anywhere in the code.  As a result we are able to
> drop a few lines by just defaulting this to -EINVAL.
> 
> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>

Applied, thanks.