Skip to content

Commit

Permalink
bridge: remove oflags from setlink/dellink.
Browse files Browse the repository at this point in the history
Commit 02dba43 ("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>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Rosen, Rami authored and davem330 committed Jan 19, 2015
1 parent 7b46a64 commit 4de8b41
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions net/core/rtnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 4de8b41

Please sign in to comment.