3 files changed, 0 insertions, 59 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2c3ae6c02a47..cc02e67239ec 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -280,15 +280,6 @@ Who:	Thomas Gleixner <tglx@linutronix.de>
 
 ---------------------------
 
-What:   shaper network driver
-When:   January 2008
-Files:  drivers/net/shaper.c, include/linux/if_shaper.h
-Why:    This driver has been marked obsolete for many years.
-        It was only designed to work on lower speed links and has design
-        flaws that lead to machine crashes. The qdisc infrastructure in
-        2.4 or later kernels, provides richer features and is more robust.
-Who:    Stephen Hemminger <shemminger@linux-foundation.org>
-
 ---------------------------
 
 What:   i2c-i810, i2c-prosavage and i2c-savage4
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index b4eefadb9adf..02e56d447a8f 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -84,8 +84,6 @@ policy-routing.txt
         - IP policy-based routing
 ray_cs.txt
         - Raylink Wireless LAN card driver info.
-shaper.txt
-        - info on the module that can shape/limit transmitted traffic.
 sk98lin.txt
         - Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit
           Ethernet Adapter family driver info
diff --git a/Documentation/networking/shaper.txt b/Documentation/networking/shaper.txt
deleted file mode 100644
index 6c4ebb66a906..000000000000
--- a/Documentation/networking/shaper.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-Traffic Shaper For Linux
-
-This is the current BETA release of the traffic shaper for Linux. It works
-within the following limits:
-
-o       Minimum shaping speed is currently about 9600 baud (it can only
-shape down to 1 byte per clock tick)
-
-o       Maximum is about 256K, it will go above this but get a bit blocky.
-
-o       If you ifconfig the master device that a shaper is attached to down
-then your machine will follow.
-
-o       The shaper must be a module.
-
-
-Setup:
-
-        A shaper device is configured using the shapeconfig program.
-Typically you will do something like this
-
-shapecfg attach shaper0 eth1
-shapecfg speed shaper0 64000
-ifconfig shaper0 myhost netmask 255.255.255.240 broadcast 1.2.3.4.255 up
-route add -net some.network netmask a.b.c.d dev shaper0
-
-The shaper should have the same IP address as the device it is attached to
-for normal use.
-
-Gotchas:
-
-        The shaper shapes transmitted traffic. It's rather impossible to
-shape received traffic except at the end (or a router) transmitting it.
-
-        Gated/routed/rwhod/mrouted all see the shaper as an additional device
-and will treat it as such unless patched. Note that for mrouted you can run
-mrouted tunnels via a traffic shaper to control bandwidth usage.
-
-        The shaper is device/route based. This makes it very easy to use
-with any setup BUT less flexible. You may need to use iproute2 to set up
-multiple route tables to get the flexibility.
-
-        There is no "borrowing" or "sharing" scheme. This is a simple
-traffic limiter. We implement Van Jacobson and Sally Floyd's CBQ
-architecture into Linux 2.2. This is the preferred solution. Shaper is
-for simple or back compatible setups.
-
-Alan