Skip to contentSkip to conversation

the scheduled shaper removal

PATCH Applied Adrian Bunk 3 participants 3 messages Jan 1, 2008 – Jan 2, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 the scheduled shaper removal

This patch contains the scheduled removal of the shaper driver.

---

 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

Documentation/feature-removal-schedule.txt +0 -9
index a9b00f9..75e9c41 100644
@@ -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]>
 
Documentation/networking/00-INDEX +0 -2
index 563e442..6196668 100644
@@ -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
Documentation/networking/shaper.txt deleted +0 -48

48 lines not on this page · raw message

drivers/net/Kconfig +0 -17
index d9107e5..1a33b6d 100644
@@ -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
-	  <file:Documentation/networking/shaper.txt> 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
drivers/net/Makefile +0 -1
index 0e5fde4..0d220be 100644
@@ -92,7 +92,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
 obj-$(CONFIG_MAC8390) += mac8390.o
 obj-$(CONFIG_APNE) += apne.o 8390.o
 obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
-obj-$(CONFIG_SHAPER) += shaper.o
 obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_FEC) += fec.o
drivers/net/shaper.c deleted +0 -603

603 lines not on this page · raw message

include/linux/Kbuild +0 -1
index f30fa92..363a016 100644
@@ -228,7 +228,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
include/linux/if_shaper.h deleted +0 -51

51 lines not on this page · raw message