[PATCH net-next] bridge: remove oflags from setlink/dellink.

[PATCH net-next] bridge: remove oflags from setlink/dellink.

[Rami Rosen]

Commit 02dba4388d16 ("bridge: fix setlink/dellink notifications") removed usage of oflags in 
both rtnl_bridge_setlink() and rtnl_bridge_dellink() methods. This patch removes this variable as it is no 
longer needed.

Signed-off-by: Rami Rosen <rami.rosen@intel.com>
---
 net/core/rtnetlink.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 0e26b9f..47b39f3 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2918,7 +2918,7 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
 	struct net_device *dev;
 	struct nlattr *br_spec, *attr = NULL;
 	int rem, err = -EOPNOTSUPP;
-	u16 oflags, flags = 0;
+	u16 flags = 0;
 	bool have_flags = false;
 
 	if (nlmsg_len(nlh) < sizeof(*ifm))
@@ -2948,8 +2948,6 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
 		}
 	}
 
-	oflags = flags;
-
 	if (!flags || (flags & BRIDGE_FLAGS_MASTER)) {
 		struct net_device *br_dev = netdev_master_upper_dev_get(dev);
 
@@ -2993,7 +2991,7 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
 	struct net_device *dev;
 	struct nlattr *br_spec, *attr = NULL;
 	int rem, err = -EOPNOTSUPP;
-	u16 oflags, flags = 0;
+	u16 flags = 0;
 	bool have_flags = false;
 
 	if (nlmsg_len(nlh) < sizeof(*ifm))
@@ -3023,8 +3021,6 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
 		}
 	}
 
-	oflags = flags;
-
 	if (!flags || (flags & BRIDGE_FLAGS_MASTER)) {
 		struct net_device *br_dev = netdev_master_upper_dev_get(dev);
 
-- 
1.9.3

Re: [PATCH net-next] bridge: remove oflags from setlink/dellink.

[David Miller]

From: Rami Rosen <rami.rosen@intel.com>
Date: Mon, 19 Jan 2015 11:45:04 +0200

> Commit 02dba4388d16 ("bridge: fix setlink/dellink notifications") removed usage of oflags in 
> both rtnl_bridge_setlink() and rtnl_bridge_dellink() methods. This patch removes this variable as it is no 
> longer needed.
> 
> Signed-off-by: Rami Rosen <rami.rosen@intel.com>

Applied, thanks.