[RFC net-next 06/11] net: dsa: allow switches to working without tagging
From: Florian Fainelli <f.fainelli@gmail.com>
Date: 2014-05-14 05:01:25
Subsystem:
networking [dsa], networking [general], the rest · Maintainers:
Andrew Lunn, Vladimir Oltean, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
In case switch port tagging is disabled, allow us to continue using the master net_device operations instead of the tag-specific ones. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- net/dsa/slave.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index d2dbd271300a..7b190b6f64e4 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c@@ -332,6 +332,27 @@ static const struct net_device_ops trailer_netdev_ops = { }; #endif +static netdev_tx_t dsa_slave_dummy_xmit(struct sk_buff *skb, struct net_device *dev) +{ + struct dsa_slave_priv *p = netdev_priv(dev); + + skb->dev = p->parent->dst->master_netdev; + dev_queue_xmit(skb); + + return NETDEV_TX_OK; +} + +static const struct net_device_ops dummy_netdev_ops = { + .ndo_init = dsa_slave_init, + .ndo_open = dsa_slave_open, + .ndo_stop = dsa_slave_close, + .ndo_start_xmit = dsa_slave_dummy_xmit, + .ndo_change_rx_flags = dsa_slave_change_rx_flags, + .ndo_set_rx_mode = dsa_slave_set_rx_mode, + .ndo_set_mac_address = dsa_slave_set_mac_address, + .ndo_do_ioctl = dsa_slave_ioctl, +}; + static void dsa_slave_adjust_link(struct net_device *dev) { struct dsa_slave_priv *p = netdev_priv(dev);
@@ -422,7 +443,8 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent, break; #endif default: - BUG(); + slave_dev->netdev_ops = &dummy_netdev_ops; + break; } parent->of_node = ds->pd->port_dn[port];
--
1.9.1