net: switchdev: support static FDB addresses

This patch adds an ndm_state member to the switchdev_obj_fdb structure,
in order to support static FDB addresses.

Set Rocker ndm_state to NUD_REACHABLE.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index b77e0e7307d45e22ea28d1bf88c14116ef3ab09b..af050759eb44c1a7b7a93cede127ecf01400d811 100644 (file)
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4544,6 +4544,7 @@ static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
                if (found->key.pport != rocker_port->pport)
                        continue;
                fdb->addr = found->key.addr;
+               fdb->ndm_state = NUD_REACHABLE;
                fdb->vid = rocker_port_vlan_to_vid(rocker_port,
                                                   found->key.vlan_id);
                err = obj->cb(rocker_port->dev, obj);

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 89da8934519bb720c4d5f1f479040a889e6079fd..319baab3b48efb9035a7987c6dbf96b9f8afe5b0 100644 (file)
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -72,6 +72,7 @@ struct switchdev_obj {
                struct switchdev_obj_fdb {              /* PORT_FDB */
                        const unsigned char *addr;
                        u16 vid;
+                       u16 ndm_state;
                } fdb;
        } u;
 };

diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 33bafa2e703e299f3b423d1f95b2a21cf177c634..16c1c43980a12dbe11832ad61777333446b69eea 100644 (file)
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -810,7 +810,7 @@ static int switchdev_port_fdb_dump_cb(struct net_device *dev,
        ndm->ndm_flags   = NTF_SELF;
        ndm->ndm_type    = 0;
        ndm->ndm_ifindex = dev->ifindex;
-       ndm->ndm_state   = NUD_REACHABLE;
+       ndm->ndm_state   = obj->u.fdb.ndm_state;
 
        if (nla_put(dump->skb, NDA_LLADDR, ETH_ALEN, obj->u.fdb.addr))
                goto nla_put_failure;