bridge: add flags argument to ndo_bridge_setlink and ndo_bridge_dellink

bridge flags are needed inside ndo_bridge_setlink/dellink handlers to
avoid another call to parse IFLA_AF_SPEC inside these handlers

This is used later in this series

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

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)
                         goto out;
                 }
 
-                err = br_dev->netdev_ops->ndo_bridge_setlink(dev, nlh);
+                err = br_dev->netdev_ops->ndo_bridge_setlink(dev, nlh, flags);
                 if (err)
                         goto out;
 
@@ -3002,7 +3002,8 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
                 if (!dev->netdev_ops->ndo_bridge_setlink)
                         err = -EOPNOTSUPP;
                 else
-                        err = dev->netdev_ops->ndo_bridge_setlink(dev, nlh);
+                        err = dev->netdev_ops->ndo_bridge_setlink(dev, nlh,
+                                                                  flags);
                 if (!err) {
                         flags &= ~BRIDGE_FLAGS_SELF;
 
@@ -3064,7 +3065,7 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
                         goto out;
                 }
 
-                err = br_dev->netdev_ops->ndo_bridge_dellink(dev, nlh);
+                err = br_dev->netdev_ops->ndo_bridge_dellink(dev, nlh, flags);
                 if (err)
                         goto out;
 
@@ -3075,7 +3076,8 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
                 if (!dev->netdev_ops->ndo_bridge_dellink)
                         err = -EOPNOTSUPP;
                 else
-                        err = dev->netdev_ops->ndo_bridge_dellink(dev, nlh);
+                        err = dev->netdev_ops->ndo_bridge_dellink(dev, nlh,
+                                                                  flags);
 
                 if (!err) {
                         flags &= ~BRIDGE_FLAGS_SELF;