Commit 4de8b413 authored by Rosen, Rami's avatar Rosen, Rami Committed by David S. Miller
Browse files

bridge: remove oflags from setlink/dellink.

Commit 02dba438

 ("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: default avatarRami Rosen <rami.rosen@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7b46a644
...@@ -2918,7 +2918,7 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh) ...@@ -2918,7 +2918,7 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
struct net_device *dev; struct net_device *dev;
struct nlattr *br_spec, *attr = NULL; struct nlattr *br_spec, *attr = NULL;
int rem, err = -EOPNOTSUPP; int rem, err = -EOPNOTSUPP;
u16 oflags, flags = 0; u16 flags = 0;
bool have_flags = false; bool have_flags = false;
if (nlmsg_len(nlh) < sizeof(*ifm)) if (nlmsg_len(nlh) < sizeof(*ifm))
...@@ -2948,8 +2948,6 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh) ...@@ -2948,8 +2948,6 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
} }
} }
oflags = flags;
if (!flags || (flags & BRIDGE_FLAGS_MASTER)) { if (!flags || (flags & BRIDGE_FLAGS_MASTER)) {
struct net_device *br_dev = netdev_master_upper_dev_get(dev); 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) ...@@ -2993,7 +2991,7 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
struct net_device *dev; struct net_device *dev;
struct nlattr *br_spec, *attr = NULL; struct nlattr *br_spec, *attr = NULL;
int rem, err = -EOPNOTSUPP; int rem, err = -EOPNOTSUPP;
u16 oflags, flags = 0; u16 flags = 0;
bool have_flags = false; bool have_flags = false;
if (nlmsg_len(nlh) < sizeof(*ifm)) if (nlmsg_len(nlh) < sizeof(*ifm))
...@@ -3023,8 +3021,6 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh) ...@@ -3023,8 +3021,6 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
} }
} }
oflags = flags;
if (!flags || (flags & BRIDGE_FLAGS_MASTER)) { if (!flags || (flags & BRIDGE_FLAGS_MASTER)) {
struct net_device *br_dev = netdev_master_upper_dev_get(dev); struct net_device *br_dev = netdev_master_upper_dev_get(dev);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment