aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
Diffstat (limited to 'net/core')
-rw-r--r--net/core/rtnetlink.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index fedd7ab4085a..673cb4c6f391 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -2991,7 +2991,7 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
2991 goto out; 2991 goto out;
2992 } 2992 }
2993 2993
2994 err = br_dev->netdev_ops->ndo_bridge_setlink(dev, nlh); 2994 err = br_dev->netdev_ops->ndo_bridge_setlink(dev, nlh, flags);
2995 if (err) 2995 if (err)
2996 goto out; 2996 goto out;
2997 2997
@@ -3002,7 +3002,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
3002 if (!dev->netdev_ops->ndo_bridge_setlink) 3002 if (!dev->netdev_ops->ndo_bridge_setlink)
3003 err = -EOPNOTSUPP; 3003 err = -EOPNOTSUPP;
3004 else 3004 else
3005 err = dev->netdev_ops->ndo_bridge_setlink(dev, nlh); 3005 err = dev->netdev_ops->ndo_bridge_setlink(dev, nlh,
3006 flags);
3006 if (!err) { 3007 if (!err) {
3007 flags &= ~BRIDGE_FLAGS_SELF; 3008 flags &= ~BRIDGE_FLAGS_SELF;
3008 3009
@@ -3064,7 +3065,7 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
3064 goto out; 3065 goto out;
3065 } 3066 }
3066 3067
3067 err = br_dev->netdev_ops->ndo_bridge_dellink(dev, nlh); 3068 err = br_dev->netdev_ops->ndo_bridge_dellink(dev, nlh, flags);
3068 if (err) 3069 if (err)
3069 goto out; 3070 goto out;
3070 3071
@@ -3075,7 +3076,8 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
3075 if (!dev->netdev_ops->ndo_bridge_dellink) 3076 if (!dev->netdev_ops->ndo_bridge_dellink)
3076 err = -EOPNOTSUPP; 3077 err = -EOPNOTSUPP;
3077 else 3078 else
3078 err = dev->netdev_ops->ndo_bridge_dellink(dev, nlh); 3079 err = dev->netdev_ops->ndo_bridge_dellink(dev, nlh,
3080 flags);
3079 3081
3080 if (!err) { 3082 if (!err) {
3081 flags &= ~BRIDGE_FLAGS_SELF; 3083 flags &= ~BRIDGE_FLAGS_SELF;