diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-11-13 16:02:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:22:23 -0800 |
| commit | 90833aa4f496d69ca374af6acef7d1614c8693ff (patch) | |
| tree | dbac818cc40ab12d493c45778febf6b7a768f757 /net/socket.c | |
| parent | d7f7365f5776723da6df73540d855069c2daaa5c (diff) | |
| download | kernel_samsung_smdk4412-90833aa4f496d69ca374af6acef7d1614c8693ff.zip kernel_samsung_smdk4412-90833aa4f496d69ca374af6acef7d1614c8693ff.tar.gz kernel_samsung_smdk4412-90833aa4f496d69ca374af6acef7d1614c8693ff.tar.bz2 | |
[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 'net/socket.c')
| -rw-r--r-- | net/socket.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/socket.c b/net/socket.c index 6c9b9b3..e8db547 100644 --- a/net/socket.c +++ b/net/socket.c @@ -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> @@ -852,11 +851,6 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg) 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; |