Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90833aa4 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

[NET]: The scheduled removal of the frame diverter. 



This patch contains the scheduled removal of the frame diverter.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7f7365f

Documentation/feature-removal-schedule.txt

+0 −15
Original line number Diff line number Diff line
@@ -227,21 +227,6 @@ Who: Patrick McHardy <kaber@trash.net> 


---------------------------



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 <shemminger@osdl.org>



---------------------------





What:	PHYSDEVPATH, PHYSDEVBUS, PHYSDEVDRIVER in the uevent environment

When:	October 2008

Why:	The stacking of class devices makes these values misleading and

drivers/net/Space.c

+0 −1
Original line number Diff line number Diff line
@@ -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/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -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

include/linux/divert.h

deleted100644 → 0
+0 −132
Original line number Diff line number Diff line 
/*

 * Frame Diversion, Benoit Locher <Benoit.Locher@skf.com>

 *

 * Changes:

 * 		06/09/2000	BL:	initial version

 * 

 */

 

#ifndef _LINUX_DIVERT_H

#define _LINUX_DIVERT_H



#include <asm/types.h>



#define	MAX_DIVERT_PORTS	8	/* Max number of ports to divert (tcp, udp) */



/* Divertable protocols */

#define	DIVERT_PROTO_NONE	0x0000

#define	DIVERT_PROTO_IP		0x0001

#define	DIVERT_PROTO_ICMP	0x0002

#define	DIVERT_PROTO_TCP	0x0004

#define	DIVERT_PROTO_UDP	0x0008



/*

 *	This is an Ethernet Frame Diverter option block

 */

struct divert_blk

{

	int		divert;  /* are we active */

	unsigned int protos;	/* protocols */

	__u16		tcp_dst[MAX_DIVERT_PORTS]; /* specific tcp dst ports to divert */

	__u16		tcp_src[MAX_DIVERT_PORTS]; /* specific tcp src ports to divert */

	__u16		udp_dst[MAX_DIVERT_PORTS]; /* specific udp dst ports to divert */

	__u16		udp_src[MAX_DIVERT_PORTS]; /* specific udp src ports to divert */

};



/*

 * Diversion control block, for configuration with the userspace tool

 * divert

 */



typedef union _divert_cf_arg

{

	__s16		int16;

	__u16		uint16;

	__s32		int32;

	__u32		uint32;

	__s64		int64;

	__u64		uint64;

	void	__user *ptr;

} divert_cf_arg;





struct divert_cf

{

	int	cmd;				/* Command */

	divert_cf_arg 	arg1,

					arg2,

					arg3;

	int	dev_index;	/* device index (eth0=0, etc...) */

};





/* Diversion commands */

#define	DIVCMD_DIVERT			1 /* ENABLE/DISABLE diversion */

#define	DIVCMD_IP				2 /* ENABLE/DISABLE whold IP diversion */

#define	DIVCMD_TCP				3 /* ENABLE/DISABLE whold TCP diversion */

#define	DIVCMD_TCPDST			4 /* ADD/REMOVE TCP DST port for diversion */

#define	DIVCMD_TCPSRC			5 /* ADD/REMOVE TCP SRC port for diversion */

#define	DIVCMD_UDP				6 /* ENABLE/DISABLE whole UDP diversion */

#define	DIVCMD_UDPDST			7 /* ADD/REMOVE UDP DST port for diversion */

#define	DIVCMD_UDPSRC			8 /* ADD/REMOVE UDP SRC port for diversion */

#define	DIVCMD_ICMP				9 /* ENABLE/DISABLE whole ICMP diversion */

#define	DIVCMD_GETSTATUS		10 /* GET the status of the diverter */

#define	DIVCMD_RESET			11 /* Reset the diverter on the specified dev */

#define DIVCMD_GETVERSION		12 /* Retrieve the diverter code version (char[32]) */



/* General syntax of the commands:

 * 

 * DIVCMD_xxxxxx(arg1, arg2, arg3, dev_index)

 * 

 * SIOCSIFDIVERT:

 *   DIVCMD_DIVERT(DIVARG1_ENABLE|DIVARG1_DISABLE, , ,ifindex)

 *   DIVCMD_IP(DIVARG1_ENABLE|DIVARG1_DISABLE, , , ifindex)

 *   DIVCMD_TCP(DIVARG1_ENABLE|DIVARG1_DISABLE, , , ifindex)

 *   DIVCMD_TCPDST(DIVARG1_ADD|DIVARG1_REMOVE, port, , ifindex)

 *   DIVCMD_TCPSRC(DIVARG1_ADD|DIVARG1_REMOVE, port, , ifindex)

 *   DIVCMD_UDP(DIVARG1_ENABLE|DIVARG1_DISABLE, , , ifindex)

 *   DIVCMD_UDPDST(DIVARG1_ADD|DIVARG1_REMOVE, port, , ifindex)

 *   DIVCMD_UDPSRC(DIVARG1_ADD|DIVARG1_REMOVE, port, , ifindex)

 *   DIVCMD_ICMP(DIVARG1_ENABLE|DIVARG1_DISABLE, , , ifindex)

 *   DIVCMD_RESET(, , , ifindex)

 *   

 * SIOGIFDIVERT:

 *   DIVCMD_GETSTATUS(divert_blk, , , ifindex)

 *   DIVCMD_GETVERSION(string[3])

 */





/* Possible values for arg1 */

#define	DIVARG1_ENABLE			0 /* ENABLE something */

#define	DIVARG1_DISABLE			1 /* DISABLE something */

#define DIVARG1_ADD				2 /* ADD something */

#define DIVARG1_REMOVE			3 /* REMOVE something */





#ifdef __KERNEL__



/* diverter functions */

#include <linux/skbuff.h>



#ifdef CONFIG_NET_DIVERT

#include <linux/netdevice.h>



int alloc_divert_blk(struct net_device *);

void free_divert_blk(struct net_device *);

int divert_ioctl(unsigned int cmd, struct divert_cf __user *arg);

void divert_frame(struct sk_buff *skb);

static inline void handle_diverter(struct sk_buff *skb)

{

	/* if diversion is supported on device, then divert */

	if (skb->dev->divert && skb->dev->divert->divert)

		divert_frame(skb);

}



#else

# define alloc_divert_blk(dev)		(0)

# define free_divert_blk(dev)		do {} while (0)

# define divert_ioctl(cmd, arg)		(-ENOPKG)

# define handle_diverter(skb)		do {} while (0)

#endif

#endif 

#endif	/* _LINUX_DIVERT_H */

include/linux/netdevice.h

+0 −6
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <linux/percpu.h>

#include <linux/dmaengine.h>



struct divert_blk;

struct vlan_group;

struct ethtool_ops;

struct netpoll_info;
@@ -517,11 +516,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 class_device	class_dev;

	/* space for optional statistics and wireless sysfs groups */