net: bridge: resolve forwarding path for bridge devices

Add .ndo_fill_forward_path for bridge devices.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 8823a56744f1e2bb7b969e251f52e7ab9d49607f..a24270b0d2003b5653e6fbe23c46d74604d890d4 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -851,6 +851,7 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev,
 enum net_device_path_type {
        DEV_PATH_ETHERNET = 0,
        DEV_PATH_VLAN,
+       DEV_PATH_BRIDGE,
 };
 
 struct net_device_path {

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 3f2f06b4dd277770f3cd010895cfaca1232f6217..c241719013f4919748b5790883b9e5f2254332dc 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -385,6 +385,32 @@ static int br_del_slave(struct net_device *dev, struct net_device *slave_dev)
        return br_del_if(br, slave_dev);
 }
 
+static int br_fill_forward_path(struct net_device_path_ctx *ctx,
+                               struct net_device_path *path)
+{
+       struct net_bridge_fdb_entry *f;
+       struct net_bridge_port *dst;
+       struct net_bridge *br;
+
+       if (netif_is_bridge_port(ctx->dev))
+               return -1;
+
+       br = netdev_priv(ctx->dev);
+       f = br_fdb_find_rcu(br, ctx->daddr, 0);
+       if (!f || !f->dst)
+               return -1;
+
+       dst = READ_ONCE(f->dst);
+       if (!dst)
+               return -1;
+
+       path->type = DEV_PATH_BRIDGE;
+       path->dev = dst->br->dev;
+       ctx->dev = dst->dev;
+
+       return 0;
+}
+
 static const struct ethtool_ops br_ethtool_ops = {
        .get_drvinfo             = br_getinfo,
        .get_link                = ethtool_op_get_link,
@@ -419,6 +445,7 @@ static const struct net_device_ops br_netdev_ops = {
        .ndo_bridge_setlink      = br_setlink,
        .ndo_bridge_dellink      = br_dellink,
        .ndo_features_check      = passthru_features_check,
+       .ndo_fill_forward_path   = br_fill_forward_path,
 };
 
 static struct device_type br_type = {