|
@@ -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);
|
|
|
|