diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-11-13 19:02:22 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:22:23 -0500 |
commit | 90833aa4f496d69ca374af6acef7d1614c8693ff (patch) | |
tree | dbac818cc40ab12d493c45778febf6b7a768f757 /include/linux/netdevice.h | |
parent | d7f7365f5776723da6df73540d855069c2daaa5c (diff) |
[NET]: The scheduled removal of the frame diverter.
This patch contains the scheduled removal of the frame diverter.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 83b8c4f1d69d..4e967b2e22cc 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <linux/percpu.h> | 38 | #include <linux/percpu.h> |
39 | #include <linux/dmaengine.h> | 39 | #include <linux/dmaengine.h> |
40 | 40 | ||
41 | struct divert_blk; | ||
42 | struct vlan_group; | 41 | struct vlan_group; |
43 | struct ethtool_ops; | 42 | struct ethtool_ops; |
44 | struct netpoll_info; | 43 | struct netpoll_info; |
@@ -517,11 +516,6 @@ struct net_device | |||
517 | /* bridge stuff */ | 516 | /* bridge stuff */ |
518 | struct net_bridge_port *br_port; | 517 | struct net_bridge_port *br_port; |
519 | 518 | ||
520 | #ifdef CONFIG_NET_DIVERT | ||
521 | /* this will get initialized at each interface type init routine */ | ||
522 | struct divert_blk *divert; | ||
523 | #endif /* CONFIG_NET_DIVERT */ | ||
524 | |||
525 | /* class/net/name entry */ | 519 | /* class/net/name entry */ |
526 | struct class_device class_dev; | 520 | struct class_device class_dev; |
527 | /* space for optional statistics and wireless sysfs groups */ | 521 | /* space for optional statistics and wireless sysfs groups */ |