Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[linux-2.6-omap-h63xx.git] / net / dsa / slave.c

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 3cb331e98b89212fc24cc750f62252aae57cb2f0..37616884b8a9c624f85ecf9350b9758e16aa0bfb 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -239,10 +239,20 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
        memcpy(slave_dev->dev_addr, master->dev_addr, ETH_ALEN);
        slave_dev->tx_queue_len = 0;
        switch (ds->tag_protocol) {
+#ifdef CONFIG_NET_DSA_TAG_DSA
+       case htons(ETH_P_DSA):
+               slave_dev->hard_start_xmit = dsa_xmit;
+               break;
+#endif
 #ifdef CONFIG_NET_DSA_TAG_EDSA
        case htons(ETH_P_EDSA):
                slave_dev->hard_start_xmit = edsa_xmit;
                break;
+#endif
+#ifdef CONFIG_NET_DSA_TAG_TRAILER
+       case htons(ETH_P_TRAILER):
+               slave_dev->hard_start_xmit = trailer_xmit;
+               break;
 #endif
        default:
                BUG();