diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-15 17:24:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-15 17:24:29 -0400 |
| commit | 0486b60a8c62d3a9470374601dbd2f5f03afb1dd (patch) | |
| tree | 348e36396eda758e021a8473b330c19cd571e76f /include/linux | |
| parent | 6cca9adb786184be21f30be0982e3ea0281f75cb (diff) | |
| parent | b4d2394d01bc642e95b2cba956d908423c1bef77 (diff) | |
Merge branch 'dsa-next'
Alexander Duyck says:
====================
DSA Cleanups
This patch series does two things, first it cleans up the tag_protocol and
protocol ops being configured seperately. Second it addresses the desire
to split DSA away from relying on a MII bus.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f9e81d10a3b9..28d4378615e5 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1928,13 +1928,6 @@ struct udp_offload { struct offload_callbacks callbacks; }; -struct dsa_device_ops { - netdev_tx_t (*xmit)(struct sk_buff *skb, struct net_device *dev); - int (*rcv)(struct sk_buff *skb, struct net_device *dev, - struct packet_type *pt, struct net_device *orig_dev); -}; - - /* often modified stats are per cpu, other are shared (netdev->stats) */ struct pcpu_sw_netstats { u64 rx_packets; |