This patch contains the scheduled removal of the shaper driver.
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
Documentation/feature-removal-schedule.txt |9
Documentation/networking/00-INDEX |2
Documentation/networking/shaper.txt| 48 -
drivers/net/Kconfig| 17
drivers/net/Makefile |1
drivers/net/shaper.c | 603 -
include/linux/Kbuild |1
include/linux/if_shaper.h | 51 -
8 files changed, 732 deletions(-)
307a9184aa372b39b15d7ca941a1302dbd053049
diff --git a/Documentation/feature-removal-schedule.txt
b/Documentation/feature-removal-schedule.txt
index a9b00f9..75e9c41 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -305,11 +305,2 @@ Who: Thomas Gleixner <[EMAIL PROTECTED]>
---
-
-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 <[EMAIL PROTECTED]>
diff --git a/Documentation/networking/00-INDEX
b/Documentation/networking/00-INDEX
index 563e442..6196668 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -82,8 +82,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 6c4ebb6..000
--- 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
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d9107e5..1a33b6d 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3021,23 +3021,6 @@ config NET_FC
adaptor below. You also should have said Y to "SCSI support" and
"SCSI generic support".
-config SHAPER
- tristate "Traffic Shaper (OBSOLETE)"
- depends on EXPERIMENTAL
- ---help---
- The traffic shaper is a virtual network device that allows you to
- limit the rate of outgoing data flow over some other network device.
- The traffic that you want to slow down can then be routed through
- these virtual devices. See
- for more information.
-
- An alternative to this traffic shaper are traffic schedulers which
- you'll get if you say Y to "QoS and/or fair queuing" in
- "Networking options".
-
- To compile this driver as a module, choose M here: the module
- will be called shaper. If unsure, say N.
-
config NETCONSOLE
tristate "Network console logging support (EXPERIMENTAL)"
depends on EXPERIMENTAL
diff --git
