]> git.baikalelectronics.ru Git - kernel.git/commitdiff
rtnetlink: add extack support in fdb del handlers
authorAlaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>
Thu, 5 May 2022 15:09:57 +0000 (17:09 +0200)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 May 2022 10:58:20 +0000 (11:58 +0100)
Add extack support to .ndo_fdb_del in netdevice.h and
all related methods.

Signed-off-by: Alaa Mohamed <eng.alaamohamedsoliman.am@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/intel/ice/ice_main.c
drivers/net/ethernet/mscc/ocelot_net.c
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
drivers/net/macvlan.c
drivers/net/vxlan/vxlan_core.c
include/linux/netdevice.h
net/bridge/br_fdb.c
net/bridge/br_private.h
net/core/rtnetlink.c

index 049a3f48caffd66ebd8bd8ca7c2835390183336c..867908f9466164a294090626f8ffa0f8ec01adc1 100644 (file)
@@ -5688,11 +5688,12 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],
  * @dev: the net device pointer
  * @addr: the MAC address entry being added
  * @vid: VLAN ID
+ * @extack: netlink extended ack
  */
 static int
 ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],
            struct net_device *dev, const unsigned char *addr,
-           __always_unused u16 vid)
+           __always_unused u16 vid, struct netlink_ext_ack *extack)
 {
        int err;
 
index 247bc105bdd2c2ae7bcd48d15c0a5275e23d85e8..616d8127ef51513f6b69c696db5517c6352ba30f 100644 (file)
@@ -774,7 +774,8 @@ static int ocelot_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
 
 static int ocelot_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
                               struct net_device *dev,
-                              const unsigned char *addr, u16 vid)
+                              const unsigned char *addr, u16 vid,
+                                  struct netlink_ext_ack *extack)
 {
        struct ocelot_port_private *priv = netdev_priv(dev);
        struct ocelot_port *ocelot_port = &priv->port;
index d320567b2cca70e0e03b88042494611c96f3643a..28476b982bab6c0a3778947b294a1ae484087ce0 100644 (file)
@@ -368,7 +368,8 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p)
 
 static int qlcnic_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
                        struct net_device *netdev,
-                       const unsigned char *addr, u16 vid)
+                       const unsigned char *addr, u16 vid,
+                       struct netlink_ext_ack *extack)
 {
        struct qlcnic_adapter *adapter = netdev_priv(netdev);
        int err = -EOPNOTSUPP;
index 0017bd0fe3bb06d3a6486b7e8eaaef76bd978b6f..eff75beb13957b81f8949922d0ffa29b68ebb3f6 100644 (file)
@@ -1020,7 +1020,8 @@ static int macvlan_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
 
 static int macvlan_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
                           struct net_device *dev,
-                          const unsigned char *addr, u16 vid)
+                          const unsigned char *addr, u16 vid,
+                          struct netlink_ext_ack *extack)
 {
        struct macvlan_dev *vlan = netdev_priv(dev);
        int err = -EINVAL;
index 2bda692f70c54b640e630ab27149cc97eca94883..91b7bb01fb1076e29c1648e0f7a4973652df7c94 100644 (file)
@@ -1280,7 +1280,8 @@ out:
 /* Delete entry (via netlink) */
 static int vxlan_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
                            struct net_device *dev,
-                           const unsigned char *addr, u16 vid)
+                           const unsigned char *addr, u16 vid,
+                               struct netlink_ext_ack *extack)
 {
        struct vxlan_dev *vxlan = netdev_priv(dev);
        union vxlan_addr ip;
index 8cf0ac616cb9b7279e643cf6630f42c807742244..74c97a34921d48c593c08e2bed72e099f42520a3 100644 (file)
@@ -1513,7 +1513,7 @@ struct net_device_ops {
                                               struct nlattr *tb[],
                                               struct net_device *dev,
                                               const unsigned char *addr,
-                                              u16 vid);
+                                              u16 vid, struct netlink_ext_ack *extack);
        int                     (*ndo_fdb_del_bulk)(struct ndmsg *ndm,
                                                    struct nlattr *tb[],
                                                    struct net_device *dev,
index 1a3d583fbc8e2de3e6220ed5d63ab550a192ae1d..e7f4fccb6adb452aa321441a468fc81381ae5c3e 100644 (file)
@@ -1253,7 +1253,8 @@ static int __br_fdb_delete(struct net_bridge *br,
 /* Remove neighbor entry with RTM_DELNEIGH */
 int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
                  struct net_device *dev,
-                 const unsigned char *addr, u16 vid)
+                 const unsigned char *addr, u16 vid,
+                 struct netlink_ext_ack *extack)
 {
        struct net_bridge_vlan_group *vg;
        struct net_bridge_port *p = NULL;
index 6ae882cfae1cc3b703cec29835ea52e93c7d5c27..06e5f6faa431392b141cb28f2f28ebdbbf0bedd1 100644 (file)
@@ -793,7 +793,8 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                   const unsigned char *addr, u16 vid, unsigned long flags);
 
 int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[],
-                 struct net_device *dev, const unsigned char *addr, u16 vid);
+                 struct net_device *dev, const unsigned char *addr, u16 vid,
+                 struct netlink_ext_ack *extack);
 int br_fdb_delete_bulk(struct ndmsg *ndm, struct nlattr *tb[],
                       struct net_device *dev, u16 vid,
                       struct netlink_ext_ack *extack);
index e6d4b9272995b7a9b9f83b8868845222f4785edf..6aff02df9ba51c99e8f1dd8e1c1da393c92b8ebf 100644 (file)
@@ -4258,7 +4258,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
                ops = br_dev->netdev_ops;
                if (!del_bulk) {
                        if (ops->ndo_fdb_del)
-                               err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid);
+                               err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid, extack);
                } else {
                        if (ops->ndo_fdb_del_bulk)
                                err = ops->ndo_fdb_del_bulk(ndm, tb, dev, vid,
@@ -4276,7 +4276,7 @@ static int rtnl_fdb_del(struct sk_buff *skb, struct nlmsghdr *nlh,
                ops = dev->netdev_ops;
                if (!del_bulk) {
                        if (ops->ndo_fdb_del)
-                               err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid);
+                               err = ops->ndo_fdb_del(ndm, tb, dev, addr, vid, extack);
                        else
                                err = ndo_dflt_fdb_del(ndm, tb, dev, addr, vid);
                } else {