the scheduled removal of the frame diverter
Subsystems (4)
PATCH 1/1 the scheduled removal of the frame diverter
This patch contains the scheduled removal of the frame diverter.
---
Documentation/feature-removal-schedule.txt | 15 drivers/net/Space.c | 1 include/linux/Kbuild | 1 include/linux/divert.h | 132 ----- include/linux/netdevice.h | 6 include/linux/sockios.h | 4 net/Kconfig | 27 - net/core/Makefile | 1 net/core/dev.c | 20 net/core/dv.c | 546 --------------------- net/core/sysctl_net_core.c | 14 net/socket.c | 6 12 files changed, 6 insertions(+), 767 deletions(-)
Documentation/feature-removal-schedule.txt renamed from Documentation/feature-removal-schedule.txt.old +0 -15
@@ -219,21 +219,6 @@ Who: Patrick McHardy <[email protected]> --------------------------- -What: frame diverter -When: November 2006 -Why: The frame diverter is included in most distribution kernels, but is - broken. It does not correctly handle many things: - - IPV6 - - non-linear skb's - - network device RCU on removal - - input frames not correctly checked for protocol errors - It also adds allocation overhead even if not enabled. - It is not clear if anyone is still using it. -Who: Stephen Hemminger <[email protected]> - ---------------------------- - - What: PHYSDEVPATH, PHYSDEVBUS, PHYSDEVDRIVER in the uevent environment When: October 2008 Why: The stacking of class devices makes these values misleading and
net/Kconfig renamed from net/Kconfig.old +0 -27
@@ -175,33 +175,6 @@ source "net/ipx/Kconfig" source "drivers/net/appletalk/Kconfig" source "net/x25/Kconfig" source "net/lapb/Kconfig" - -config NET_DIVERT - bool "Frame Diverter (EXPERIMENTAL)" - depends on EXPERIMENTAL && BROKEN - ---help--- - The Frame Diverter allows you to divert packets from the - network, that are not aimed at the interface receiving it (in - promisc. mode). Typically, a Linux box setup as an Ethernet bridge - with the Frames Diverter on, can do some *really* transparent www - caching using a Squid proxy for example. - - This is very useful when you don't want to change your router's - config (or if you simply don't have access to it). - - The other possible usages of diverting Ethernet Frames are - numberous: - - reroute smtp traffic to another interface - - traffic-shape certain network streams - - transparently proxy smtp connections - - etc... - - For more informations, please refer to: - <http://diverter.sourceforge.net/> - <http://perso.wanadoo.fr/magpie/EtherDivert.html> - - If unsure, say N. - source "net/econet/Kconfig" source "net/wanrouter/Kconfig" source "net/sched/Kconfig"
net/core/Makefile renamed from net/core/Makefile.old +0 -1
@@ -12,7 +12,6 @@ obj-y += dev.o ethtool.o dev_mcast obj-$(CONFIG_XFRM) += flow.o obj-$(CONFIG_SYSFS) += net-sysfs.o -obj-$(CONFIG_NET_DIVERT) += dv.o obj-$(CONFIG_NET_PKTGEN) += pktgen.o obj-$(CONFIG_WIRELESS_EXT) += wireless.o obj-$(CONFIG_NETPOLL) += netpoll.o
include/linux/netdevice.h renamed from include/linux/netdevice.h.old +0 -6
@@ -38,7 +38,6 @@#include <linux/percpu.h> #include <linux/dmaengine.h> -struct divert_blk ;struct vlan_group ;struct ethtool_ops ;struct netpoll_info ;
@@ -515,11 +514,6 @@ struct net_device/* bridge stuff */ struct net_bridge_port *br_port; -#ifdef CONFIG_NET_DIVERT -/* this will get initialized at each interface type init routine */ -struct divert_blk *divert; -#endif /* CONFIG_NET_DIVERT */ -/* class/net/name entry */ struct device dev;/* space for optional statistics and wireless sysfs groups */
include/linux/sockios.h renamed from include/linux/sockios.h.old +2 -2
@@ -72,8 +72,8 @@#define SIOCGIFTXQLEN 0x8942/* Get the tx queue length */ #define SIOCSIFTXQLEN 0x8943/* Set the tx queue length */ -#define SIOCGIFDIVERT 0x8944/* Frame diversion support */ -#define SIOCSIFDIVERT 0x8945/* Set frame diversion options */ +/* SIOCGIFDIVERT was: 0x8944 Frame diversion support */ +/* SIOCSIFDIVERT was: 0x8945 Set frame diversion options */ #define SIOCETHTOOL 0x8946/* Ethtool interface */
include/linux/Kbuild renamed from include/linux/Kbuild.old +0 -1
@@ -193,7 +193,6 @@ unifdef-y += cuda.h unifdef-y += cyclades.h unifdef-y += dccp.h unifdef-y += dirent.h -unifdef-y += divert.h unifdef-y += dlm.h unifdef-y += elfcore.h unifdef-y += errno.h
net/core/sysctl_net_core.c renamed from net/core/sysctl_net_core.c.old +0 -14
@@ -21,10 +21,6 @@ extern __u32 sysctl_rmem_max;extern int sysctl_core_destroy_delay; -#ifdef CONFIG_NET_DIVERT -extern char sysctl_divert_version[]; -#endif /* CONFIG_NET_DIVERT */ -#ifdef CONFIG_XFRM extern u32 sysctl_xfrm_aevent_etime;extern u32 sysctl_xfrm_aevent_rseqth;
@@ -105,16 +101,6 @@ ctl_table core_table[] = { .mode = 0644, .proc_handler = &proc_dointvec }, -#ifdef CONFIG_NET_DIVERT - { - .ctl_name = NET_CORE_DIVERT_VERSION, - .procname = "divert_version", - .data = (void *)sysctl_divert_version, - .maxlen = 32, - .mode = 0444, - .proc_handler = &proc_dostring - }, -#endif /* CONFIG_NET_DIVERT */#ifdef CONFIG_XFRM { .ctl_name = NET_CORE_AEVENT_ETIME,
net/core/dev.c renamed from net/core/dev.c.old +4 -16
@@ -98,7 +98,6 @@#include <linux/seq_file.h> #include <linux/stat.h> #include <linux/if_bridge.h> -#include <linux/divert.h> #include <net/dst.h> #include <net/pkt_sched.h> #include <net/checksum.h>
@@ -1827,8 +1826,6 @@ int netif_receive_skb(struct sk_buff *sk ncls:#endif -handle_diverter (skb); -if (handle_bridge (&skb, &pt_prev, &ret, orig_dev)) goto out;
@@ -2898,10 +2895,6 @@ int register_netdevice(struct net_devicespin_lock_init (&dev->ingress_lock);#endif - ret =alloc_divert_blk (dev); -if (ret) - goto out; - dev->iflink =-1 ;/* Init, if this function is available */
@@ -2910,13 +2903,13 @@ int register_netdevice(struct net_deviceif (ret) {if (ret >0 ) ret = -EIO ; - goto out_err; + goto out; } }if (!dev_valid_name (dev->name)) { ret = -EINVAL ; - goto out_err; + goto out; } dev->ifindex =dev_new_index ();
@@ -2930,7 +2923,7 @@ int register_netdevice(struct net_device = hlist_entry(p, struct net_device, name_hlist);if (!strncmp (d->name, dev->name,IFNAMSIZ )) { ret = -EEXIST ; - goto out_err; + goto out; } }
@@ -2974,7 +2967,7 @@ int register_netdevice(struct net_device ret =netdev_register_sysfs (dev);if (ret) - goto out_err; + goto out; dev->reg_state =NETREG_REGISTERED ;/*
@@ -3001,9 +2994,6 @@ int register_netdevice(struct net_device out:return ret; -out_err: -free_divert_blk (dev); - goto out; }/**
@@ -3329,8 +3319,6 @@ int unregister_netdevice(struct net_devi/* Notifier chain MUST detach us from master device. */ BUG_TRAP (!dev->master); -free_divert_blk (dev); -/* Finish processing unregister after unlock */ net_set_todo (dev);
net/socket.c renamed from net/socket.c.old +0 -6
@@ -77,7 +77,6 @@#include <linux/cache.h> #include <linux/module.h> #include <linux/highmem.h> -#include <linux/divert.h> #include <linux/mount.h> #include <linux/security.h> #include <linux/syscalls.h>
@@ -855,11 +854,6 @@ static long sock_ioctl(struct file *file err =vlan_ioctl_hook (argp);mutex_unlock (&vlan_ioctl_mutex);break ; -case SIOCGIFDIVERT : -case SIOCSIFDIVERT : -/* Convert this to call through a hook */ - err =divert_ioctl (cmd, argp); -break ;case SIOCADDDLCI :case SIOCDELDLCI : err = -ENOPKG ;
drivers/net/Space.c renamed from drivers/net/Space.c.old +0 -1
@@ -33,7 +33,6 @@#include <linux/errno.h> #include <linux/init.h> #include <linux/netlink.h> -#include <linux/divert.h> /* A unified ethernet device probe. This is the easiest way to have every ethernet adaptor have the name "eth[0123...]".
include/linux/divert.h deleted +0 -132
132 lines not on this page · raw message
net/core/dv.c deleted +0 -546
546 lines not on this page · raw message
net/Kconfig source "net/ipx/Kconfig" · line 187
Quoted 13 lines · Adrian Bunk
This patch contains the scheduled removal of the frame diverter.
[snip]
net/Kconfig renamed from net/Kconfig.old +0
-9-config NET_DIVERT - bool "Frame Diverter (EXPERIMENTAL)" - depends on EXPERIMENTAL && BROKEN - ---help--- - The Frame Diverter allows you to divert packets from the - network, that are not aimed at the interface receiving it (in - promisc. mode). Typically, a Linux box setup as an Ethernet bridge - with the Frames Diverter on, can do some *really* transparent www - caching using a Squid proxy for example.
From my understanding of iptables/ebtables, identical functionality is already avaialble within that framework; and as such this patch is just removing broken experimental and redundant code. The IPTables code also properly handles IPv6 and all the other old warts of the frame diverter as well. I agree that this should go.
Cheers,
Kyle Moffett
From: Adrian Bunk <[email protected]>
Date: Mon, 13 Nov 2006 22:04:25 +0100
Quoted 3 lines
This patch contains the scheduled removal of the frame diverter.
Signed-off-by Adrian Bunk <[email protected]>
Applied to net-2.6.20, thanks Adrian.