[SHAPER]: The scheduled shaper removal.

This patch contains the scheduled removal of the shaper driver.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 0 insertions, 52 deletions

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index a85e87fd60d7..bc33a5c87d64 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -231,7 +231,6 @@ unifdef-y += if_ltalk.h
 unifdef-y += if_link.h
 unifdef-y += if_pppol2tp.h
 unifdef-y += if_pppox.h
-unifdef-y += if_shaper.h
 unifdef-y += if_tr.h
 unifdef-y += if_tun.h
 unifdef-y += if_vlan.h
diff --git a/include/linux/if_shaper.h b/include/linux/if_shaper.h
deleted file mode 100644
index 3b1b7ba19825..000000000000
--- a/include/linux/if_shaper.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef __LINUX_SHAPER_H
-#define __LINUX_SHAPER_H
-
-#ifdef __KERNEL__
-
-#define SHAPER_QLEN     10
-/*
- *      This is a bit speed dependent (read it shouldn't be a constant!)
- *
- *      5 is about right for 28.8 upwards. Below that double for every
- *      halving of speed or so. - ie about 20 for 9600 baud.
- */
-#define SHAPER_LATENCY  (5*HZ)
-#define SHAPER_MAXSLIP  2
-#define SHAPER_BURST    (HZ/50)         /* Good for >128K then */
-
-struct shaper
-{
-        struct sk_buff_head sendq;
-        __u32 bytespertick;
-        __u32 bitspersec;
-        __u32 shapelatency;
-        __u32 shapeclock;
-        unsigned long recovery; /* Time we can next clock a packet out on
-                                   an empty queue */
-        spinlock_t lock;
-        struct net_device *dev;
-        struct net_device_stats* (*get_stats)(struct net_device *dev);
-        struct timer_list timer;
-};
-
-#endif
-
-#define SHAPER_SET_DEV          0x0001
-#define SHAPER_SET_SPEED        0x0002
-#define SHAPER_GET_DEV          0x0003
-#define SHAPER_GET_SPEED        0x0004
-
-struct shaperconf
-{
-        __u16   ss_cmd;
-        union
-        {
-                char    ssu_name[14];
-                __u32   ssu_speed;
-        } ss_u;
-#define ss_speed ss_u.ssu_speed
-#define ss_name ss_u.ssu_name
-};
-
-#endif