aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-01-28 02:04:43 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:00:29 -0500
commitf1862b0ae2294f6970f695abf02392d025e02dbe (patch)
tree515590bb559ba8da0377907a68b1a9b42306ee34
parent9ef32d0d1f64cad414697f34bda1b269f632f0cd (diff)
[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>
Diffstat
-rw-r--r--Documentation/feature-removal-schedule.txt9
-rw-r--r--Documentation/networking/00-INDEX2
-rw-r--r--Documentation/networking/shaper.txt48
-rw-r--r--drivers/net/Kconfig17
-rw-r--r--drivers/net/Makefile1
-rw-r--r--drivers/net/shaper.c603
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/if_shaper.h51
8 files changed, 0 insertions, 732 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>
280 280
281--------------------------- 281---------------------------
282 282
283What: shaper network driver
284When: January 2008
285Files: drivers/net/shaper.c, include/linux/if_shaper.h
286Why: This driver has been marked obsolete for many years.
287 It was only designed to work on lower speed links and has design
288 flaws that lead to machine crashes. The qdisc infrastructure in
289 2.4 or later kernels, provides richer features and is more robust.
290Who: Stephen Hemminger <shemminger@linux-foundation.org>
291
292--------------------------- 283---------------------------
293 284
294What: i2c-i810, i2c-prosavage and i2c-savage4 285What: 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
84 - IP policy-based routing 84 - IP policy-based routing
85ray_cs.txt 85ray_cs.txt
86 - Raylink Wireless LAN card driver info. 86 - Raylink Wireless LAN card driver info.
87shaper.txt
88 - info on the module that can shape/limit transmitted traffic.
89sk98lin.txt 87sk98lin.txt
90 - Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit 88 - Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit
91 Ethernet Adapter family driver info 89 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 @@
1Traffic Shaper For Linux
2
3This is the current BETA release of the traffic shaper for Linux. It works
4within the following limits:
5
6o Minimum shaping speed is currently about 9600 baud (it can only
7shape down to 1 byte per clock tick)
8
9o Maximum is about 256K, it will go above this but get a bit blocky.
10
11o If you ifconfig the master device that a shaper is attached to down
12then your machine will follow.
13
14o The shaper must be a module.
15
16
17Setup:
18
19 A shaper device is configured using the shapeconfig program.
20Typically you will do something like this
21
22shapecfg attach shaper0 eth1
23shapecfg speed shaper0 64000
24ifconfig shaper0 myhost netmask 255.255.255.240 broadcast 1.2.3.4.255 up
25route add -net some.network netmask a.b.c.d dev shaper0
26
27The shaper should have the same IP address as the device it is attached to
28for normal use.
29
30Gotchas:
31
32 The shaper shapes transmitted traffic. It's rather impossible to
33shape received traffic except at the end (or a router) transmitting it.
34
35 Gated/routed/rwhod/mrouted all see the shaper as an additional device
36and will treat it as such unless patched. Note that for mrouted you can run
37mrouted tunnels via a traffic shaper to control bandwidth usage.
38
39 The shaper is device/route based. This makes it very easy to use
40with any setup BUT less flexible. You may need to use iproute2 to set up
41multiple route tables to get the flexibility.
42
43 There is no "borrowing" or "sharing" scheme. This is a simple
44traffic limiter. We implement Van Jacobson and Sally Floyd's CBQ
45architecture into Linux 2.2. This is the preferred solution. Shaper is
46for simple or back compatible setups.
47
48Alan
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a6728661c416..777bb81d9ada 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -3015,23 +3015,6 @@ config NET_FC
3015 adaptor below. You also should have said Y to "SCSI support" and 3015 adaptor below. You also should have said Y to "SCSI support" and
3016 "SCSI generic support". 3016 "SCSI generic support".
3017 3017
3018config SHAPER
3019 tristate "Traffic Shaper (OBSOLETE)"
3020 depends on EXPERIMENTAL
3021 ---help---
3022 The traffic shaper is a virtual network device that allows you to
3023 limit the rate of outgoing data flow over some other network device.
3024 The traffic that you want to slow down can then be routed through
3025 these virtual devices. See
3026 <file:Documentation/networking/shaper.txt> for more information.
3027
3028 An alternative to this traffic shaper are traffic schedulers which
3029 you'll get if you say Y to "QoS and/or fair queuing" in
3030 "Networking options".
3031
3032 To compile this driver as a module, choose M here: the module
3033 will be called shaper. If unsure, say N.
3034
3035config NETCONSOLE 3018config NETCONSOLE
3036 tristate "Network console logging support (EXPERIMENTAL)" 3019 tristate "Network console logging support (EXPERIMENTAL)"
3037 depends on EXPERIMENTAL 3020 depends on EXPERIMENTAL
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 17a2ffd73d7d..a2f2662c244b 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -93,7 +93,6 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o
93obj-$(CONFIG_MAC8390) += mac8390.o 93obj-$(CONFIG_MAC8390) += mac8390.o
94obj-$(CONFIG_APNE) += apne.o 8390.o 94obj-$(CONFIG_APNE) += apne.o 8390.o
95obj-$(CONFIG_PCMCIA_PCNET) += 8390.o 95obj-$(CONFIG_PCMCIA_PCNET) += 8390.o
96obj-$(CONFIG_SHAPER) += shaper.o
97obj-$(CONFIG_HP100) += hp100.o 96obj-$(CONFIG_HP100) += hp100.o
98obj-$(CONFIG_SMC9194) += smc9194.o 97obj-$(CONFIG_SMC9194) += smc9194.o
99obj-$(CONFIG_FEC) += fec.o 98obj-$(CONFIG_FEC) += fec.o
diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
deleted file mode 100644
index 228f650250f6..000000000000
--- a/drivers/net/shaper.c
+++ /dev/null
@@ -1,603 +0,0 @@
1/*
2 * Simple traffic shaper for Linux NET3.
3 *
4 * (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
5 * http://www.redhat.com
6 *
7 * This program is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License
9 * as published by the Free Software Foundation; either version
10 * 2 of the License, or (at your option) any later version.
11 *
12 * Neither Alan Cox nor CymruNet Ltd. admit liability nor provide
13 * warranty for any of this software. This material is provided
14 * "AS-IS" and at no charge.
15 *
16 *
17 * Algorithm:
18 *
19 * Queue Frame:
20 * Compute time length of frame at regulated speed
21 * Add frame to queue at appropriate point
22 * Adjust time length computation for followup frames
23 * Any frame that falls outside of its boundaries is freed
24 *
25 * We work to the following constants
26 *
27 * SHAPER_QLEN Maximum queued frames
28 * SHAPER_LATENCY Bounding latency on a frame. Leaving this latency
29 * window drops the frame. This stops us queueing
30 * frames for a long time and confusing a remote
31 * host.
32 * SHAPER_MAXSLIP Maximum time a priority frame may jump forward.
33 * That bounds the penalty we will inflict on low
34 * priority traffic.
35 * SHAPER_BURST Time range we call "now" in order to reduce
36 * system load. The more we make this the burstier
37 * the behaviour, the better local performance you
38 * get through packet clustering on routers and the
39 * worse the remote end gets to judge rtts.
40 *
41 * This is designed to handle lower speed links ( < 200K/second or so). We
42 * run off a 100-150Hz base clock typically. This gives us a resolution at
43 * 200Kbit/second of about 2Kbit or 256 bytes. Above that our timer
44 * resolution may start to cause much more burstiness in the traffic. We
45 * could avoid a lot of that by calling kick_shaper() at the end of the
46 * tied device transmissions. If you run above about 100K second you
47 * may need to tune the supposed speed rate for the right values.
48 *
49 * BUGS:
50 * Downing the interface under the shaper before the shaper
51 * will render your machine defunct. Don't for now shape over
52 * PPP or SLIP therefore!
53 * This will be fixed in BETA4
54 *
55 * Update History :
56 *
57 * bh_atomic() SMP races fixes and rewritten the locking code to
58 * be SMP safe and irq-mask friendly.
59 * NOTE: we can't use start_bh_atomic() in kick_shaper()
60 * because it's going to be recalled from an irq handler,
61 * and synchronize_bh() is a nono if called from irq context.
62 * 1999 Andrea Arcangeli
63 *
64 * Device statistics (tx_pakets, tx_bytes,
65 * tx_drops: queue_over_time and collisions: max_queue_exceded)
66 * 1999/06/18 Jordi Murgo <savage@apostols.org>
67 *
68 * Use skb->cb for private data.
69 * 2000/03 Andi Kleen
70 */
71
72#include <linux/module.h>
73#include <linux/kernel.h>
74#include <linux/fcntl.h>
75#include <linux/mm.h>
76#include <linux/slab.h>
77#include <linux/string.h>
78#include <linux/errno.h>
79#include <linux/netdevice.h>
80#include <linux/etherdevice.h>
81#include <linux/skbuff.h>
82#include <linux/if_arp.h>
83#include <linux/init.h>
84#include <linux/if_shaper.h>
85#include <linux/jiffies.h>
86
87#include <net/dst.h>
88#include <net/arp.h>
89#include <net/net_namespace.h>
90
91struct shaper_cb {
92 unsigned long shapeclock; /* Time it should go out */
93 unsigned long shapestamp; /* Stamp for shaper */
94 __u32 shapelatency; /* Latency on frame */
95 __u32 shapelen; /* Frame length in clocks */
96 __u16 shapepend; /* Pending */
97};
98#define SHAPERCB(skb) ((struct shaper_cb *) ((skb)->cb))
99
100static int sh_debug; /* Debug flag */
101
102#define SHAPER_BANNER "CymruNet Traffic Shaper BETA 0.04 for Linux 2.1\n"
103
104static void shaper_kick(struct shaper *sh);
105
106/*
107 * Compute clocks on a buffer
108 */
109
110static int shaper_clocks(struct shaper *shaper, struct sk_buff *skb)
111{
112 int t=skb->len/shaper->bytespertick;
113 return t;
114}
115
116/*
117 * Set the speed of a shaper. We compute this in bytes per tick since
118 * thats how the machine wants to run. Quoted input is in bits per second
119 * as is traditional (note not BAUD). We assume 8 bit bytes.
120 */
121
122static void shaper_setspeed(struct shaper *shaper, int bitspersec)
123{
124 shaper->bitspersec=bitspersec;
125 shaper->bytespertick=(bitspersec/HZ)/8;
126 if(!shaper->bytespertick)
127 shaper->bytespertick++;
128}
129
130/*
131 * Throw a frame at a shaper.
132 */
133
134
135static int shaper_start_xmit(struct sk_buff *skb, struct net_device *dev)
136{
137 struct shaper *shaper = dev->priv;
138 struct sk_buff *ptr;
139
140 spin_lock(&shaper->lock);
141 ptr=shaper->sendq.prev;
142
143 /*
144 * Set up our packet details
145 */
146
147 SHAPERCB(skb)->shapelatency=0;
148 SHAPERCB(skb)->shapeclock=shaper->recovery;
149 if(time_before(SHAPERCB(skb)->shapeclock, jiffies))
150 SHAPERCB(skb)->shapeclock=jiffies;
151 skb->priority=0; /* short term bug fix */
152 SHAPERCB(skb)->shapestamp=jiffies;
153
154 /*
155 * Time slots for this packet.
156 */
157
158 SHAPERCB(skb)->shapelen= shaper_clocks(shaper,skb);
159
160 {
161 struct sk_buff *tmp;
162 /*
163 * Up our shape clock by the time pending on the queue
164 * (Should keep this in the shaper as a variable..)
165 */
166 for(tmp=skb_peek(&shaper->sendq); tmp!=NULL &&
167 tmp!=(struct sk_buff *)&shaper->sendq; tmp=tmp->next)
168 SHAPERCB(skb)->shapeclock+=SHAPERCB(tmp)->shapelen;
169 /*
170 * Queue over time. Spill packet.
171 */
172 if(time_after(SHAPERCB(skb)->shapeclock,jiffies + SHAPER_LATENCY)) {
173 dev_kfree_skb(skb);
174 dev->stats.tx_dropped++;
175 } else
176 skb_queue_tail(&shaper->sendq, skb);
177 }
178
179 if(sh_debug)
180 printk("Frame queued.\n");
181 if(skb_queue_len(&shaper->sendq)>SHAPER_QLEN)
182 {
183 ptr=skb_dequeue(&shaper->sendq);
184 dev_kfree_skb(ptr);
185 dev->stats.collisions++;
186 }
187 shaper_kick(shaper);
188 spin_unlock(&shaper->lock);
189 return 0;
190}
191
192/*
193 * Transmit from a shaper
194 */
195
196static void shaper_queue_xmit(struct shaper *shaper, struct sk_buff *skb)
197{
198 struct sk_buff *newskb=skb_clone(skb, GFP_ATOMIC);
199 if(sh_debug)
200 printk("Kick frame on %p\n",newskb);
201 if(newskb)
202 {
203 newskb->dev=shaper->dev;
204 newskb->priority=2;
205 if(sh_debug)
206 printk("Kick new frame to %s, %d\n",
207 shaper->dev->name,newskb->priority);
208 dev_queue_xmit(newskb);
209
210 shaper->dev->stats.tx_bytes += skb->len;
211 shaper->dev->stats.tx_packets++;
212
213 if(sh_debug)
214 printk("Kicked new frame out.\n");
215 dev_kfree_skb(skb);
216 }
217}
218
219/*
220 * Timer handler for shaping clock
221 */
222
223static void shaper_timer(unsigned long data)
224{
225 struct shaper *shaper = (struct shaper *)data;
226
227 spin_lock(&shaper->lock);
228 shaper_kick(shaper);
229 spin_unlock(&shaper->lock);
230}
231
232/*
233 * Kick a shaper queue and try and do something sensible with the
234 * queue.
235 */
236
237static void shaper_kick(struct shaper *shaper)
238{
239 struct sk_buff *skb;
240
241 /*
242 * Walk the list (may be empty)
243 */
244
245 while((skb=skb_peek(&shaper->sendq))!=NULL)
246 {
247 /*
248 * Each packet due to go out by now (within an error
249 * of SHAPER_BURST) gets kicked onto the link
250 */
251
252 if(sh_debug)
253 printk("Clock = %ld, jiffies = %ld\n", SHAPERCB(skb)->shapeclock, jiffies);
254 if(time_before_eq(SHAPERCB(skb)->shapeclock, jiffies + SHAPER_BURST))
255 {
256 /*
257 * Pull the frame and get interrupts back on.
258 */
259
260 skb_unlink(skb, &shaper->sendq);
261 if (shaper->recovery <
262 SHAPERCB(skb)->shapeclock + SHAPERCB(skb)->shapelen)
263 shaper->recovery = SHAPERCB(skb)->shapeclock + SHAPERCB(skb)->shapelen;
264 /*
265 * Pass on to the physical target device via
266 * our low level packet thrower.
267 */
268
269 SHAPERCB(skb)->shapepend=0;
270 shaper_queue_xmit(shaper, skb); /* Fire */
271 }
272 else
273 break;
274 }
275
276 /*
277 * Next kick.
278 */
279
280 if(skb!=NULL)
281 mod_timer(&shaper->timer, SHAPERCB(skb)->shapeclock);
282}
283
284
285/*
286 * Bring the interface up. We just disallow this until a
287 * bind.
288 */
289
290static int shaper_open(struct net_device *dev)
291{
292 struct shaper *shaper=dev->priv;
293
294 /*
295 * Can't open until attached.
296 * Also can't open until speed is set, or we'll get
297 * a division by zero.
298 */
299
300 if(shaper->dev==NULL)
301 return -ENODEV;
302 if(shaper->bitspersec==0)
303 return -EINVAL;
304 return 0;
305}
306
307/*
308 * Closing a shaper flushes the queues.
309 */
310
311static int shaper_close(struct net_device *dev)
312{
313 struct shaper *shaper=dev->priv;
314 struct sk_buff *skb;
315
316 while ((skb = skb_dequeue(&shaper->sendq)) != NULL)
317 dev_kfree_skb(skb);
318
319 spin_lock_bh(&shaper->lock);
320 shaper_kick(shaper);
321 spin_unlock_bh(&shaper->lock);
322
323 del_timer_sync(&shaper->timer);
324 return 0;
325}
326
327/*
328 * Revectored calls. We alter the parameters and call the functions
329 * for our attached device. This enables us to bandwidth allocate after
330 * ARP and other resolutions and not before.
331 */
332
333static int shaper_header(struct sk_buff *skb, struct net_device *dev,
334 unsigned short type,
335 const void *daddr, const void *saddr, unsigned len)
336{
337 struct shaper *sh=dev->priv;
338 int v;
339 if(sh_debug)
340 printk("Shaper header\n");
341 skb->dev = sh->dev;
342 v = dev_hard_header(skb, sh->dev, type, daddr, saddr, len);
343 skb->dev = dev;
344 return v;
345}
346
347static int shaper_rebuild_header(struct sk_buff *skb)
348{
349 struct shaper *sh=skb->dev->priv;
350 struct net_device *dev=skb->dev;
351 int v;
352 if(sh_debug)
353 printk("Shaper rebuild header\n");
354 skb->dev=sh->dev;
355 v = sh->dev->header_ops->rebuild(skb);
356 skb->dev=dev;
357 return v;
358}
359
360#if 0
361static int shaper_cache(struct neighbour *neigh, struct hh_cache *hh)
362{
363 struct shaper *sh=neigh->dev->priv;
364 struct net_device *tmp;
365 int ret;
366 if(sh_debug)
367 printk("Shaper header cache bind\n");
368 tmp=neigh->dev;
369 neigh->dev=sh->dev;
370 ret=sh->hard_header_cache(neigh,hh);
371 neigh->dev=tmp;
372 return ret;
373}
374
375static void shaper_cache_update(struct hh_cache *hh, struct net_device *dev,
376 unsigned char *haddr)
377{
378 struct shaper *sh=dev->priv;
379 if(sh_debug)
380 printk("Shaper cache update\n");
381 sh->header_cache_update(hh, sh->dev, haddr);
382}
383#endif
384
385#ifdef CONFIG_INET
386
387static int shaper_neigh_setup(struct neighbour *n)
388{
389#ifdef CONFIG_INET
390 if (n->nud_state == NUD_NONE) {
391 n->ops = &arp_broken_ops;
392 n->output = n->ops->output;
393 }
394#endif
395 return 0;
396}
397
398static int shaper_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
399{
400#ifdef CONFIG_INET
401 if (p->tbl->family == AF_INET) {
402 p->neigh_setup = shaper_neigh_setup;
403 p->ucast_probes = 0;
404 p->mcast_probes = 0;
405 }
406#endif
407 return 0;
408}
409
410#else /* !(CONFIG_INET) */
411
412static int shaper_neigh_setup_dev(struct net_device *dev, struct neigh_parms *p)
413{
414 return 0;
415}
416
417#endif
418
419static const struct header_ops shaper_ops = {
420 .create = shaper_header,
421 .rebuild = shaper_rebuild_header,
422};
423
424static int shaper_attach(struct net_device *shdev, struct shaper *sh, struct net_device *dev)
425{
426 sh->dev = dev;
427 sh->get_stats=dev->get_stats;
428
429 shdev->neigh_setup = shaper_neigh_setup_dev;
430 shdev->hard_header_len=dev->hard_header_len;
431 shdev->type=dev->type;
432 shdev->addr_len=dev->addr_len;
433 shdev->mtu=dev->mtu;
434 sh->bitspersec=0;
435 return 0;
436}
437
438static int shaper_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
439{
440 struct shaperconf *ss= (struct shaperconf *)&ifr->ifr_ifru;
441 struct shaper *sh=dev->priv;
442
443 if(ss->ss_cmd == SHAPER_SET_DEV || ss->ss_cmd == SHAPER_SET_SPEED)
444 {
445 if(!capable(CAP_NET_ADMIN))
446 return -EPERM;
447 }
448
449 switch(ss->ss_cmd)
450 {
451 case SHAPER_SET_DEV:
452 {
453 struct net_device *them=__dev_get_by_name(&init_net, ss->ss_name);
454 if(them==NULL)
455 return -ENODEV;
456 if(sh->dev)
457 return -EBUSY;
458 return shaper_attach(dev,dev->priv, them);
459 }
460 case SHAPER_GET_DEV:
461 if(sh->dev==NULL)
462 return -ENODEV;
463 strcpy(ss->ss_name, sh->dev->name);
464 return 0;
465 case SHAPER_SET_SPEED:
466 shaper_setspeed(sh,ss->ss_speed);
467 return 0;
468 case SHAPER_GET_SPEED:
469 ss->ss_speed=sh->bitspersec;
470 return 0;
471 default:
472 return -EINVAL;
473 }
474}
475
476static void shaper_init_priv(struct net_device *dev)
477{
478 struct shaper *sh = dev->priv;
479
480 skb_queue_head_init(&sh->sendq);
481 init_timer(&sh->timer);
482 sh->timer.function=shaper_timer;
483 sh->timer.data=(unsigned long)sh;
484 spin_lock_init(&sh->lock);
485}
486
487/*
488 * Add a shaper device to the system
489 */
490
491static void __init shaper_setup(struct net_device *dev)
492{
493 /*
494 * Set up the shaper.
495 */
496
497 shaper_init_priv(dev);
498
499 dev->open = shaper_open;
500 dev->stop = shaper_close;
501 dev->hard_start_xmit = shaper_start_xmit;
502 dev->set_multicast_list = NULL;
503
504 /*
505 * Intialise the packet queues
506 */
507
508 /*
509 * Handlers for when we attach to a device.
510 */
511
512 dev->neigh_setup = shaper_neigh_setup_dev;
513 dev->do_ioctl = shaper_ioctl;
514 dev->hard_header_len = 0;
515 dev->type = ARPHRD_ETHER; /* initially */
516 dev->set_mac_address = NULL;
517 dev->mtu = 1500;
518 dev->addr_len = 0;
519 dev->tx_queue_len = 10;
520 dev->flags = 0;
521}
522
523static int shapers = 1;
524#ifdef MODULE
525
526module_param(shapers, int, 0);
527MODULE_PARM_DESC(shapers, "Traffic shaper: maximum number of shapers");
528
529#else /* MODULE */
530
531static int __init set_num_shapers(char *str)
532{
533 shapers = simple_strtol(str, NULL, 0);
534 return 1;
535}
536
537__setup("shapers=", set_num_shapers);
538
539#endif /* MODULE */
540
541static struct net_device **devs;
542
543static unsigned int shapers_registered = 0;
544
545static int __init shaper_init(void)
546{
547 int i;
548 size_t alloc_size;
549 struct net_device *dev;
550 char name[IFNAMSIZ];
551
552 if (shapers < 1)
553 return -ENODEV;
554
555 alloc_size = sizeof(*dev) * shapers;
556 devs = kzalloc(alloc_size, GFP_KERNEL);
557 if (!devs)
558 return -ENOMEM;
559
560 for (i = 0; i < shapers; i++) {
561
562 snprintf(name, IFNAMSIZ, "shaper%d", i);
563 dev = alloc_netdev(sizeof(struct shaper), name,
564 shaper_setup);
565 if (!dev)
566 break;
567
568 if (register_netdev(dev)) {
569 free_netdev(dev);
570 break;
571 }
572
573 devs[i] = dev;
574 shapers_registered++;
575 }
576
577 if (!shapers_registered) {
578 kfree(devs);
579 devs = NULL;
580 }
581
582 return (shapers_registered ? 0 : -ENODEV);
583}
584
585static void __exit shaper_exit (void)
586{
587 int i;
588
589 for (i = 0; i < shapers_registered; i++) {
590 if (devs[i]) {
591 unregister_netdev(devs[i]);
592 free_netdev(devs[i]);
593 }
594 }
595
596 kfree(devs);
597 devs = NULL;
598}
599
600module_init(shaper_init);
601module_exit(shaper_exit);
602MODULE_LICENSE("GPL");
603
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
231unifdef-y += if_link.h 231unifdef-y += if_link.h
232unifdef-y += if_pppol2tp.h 232unifdef-y += if_pppol2tp.h
233unifdef-y += if_pppox.h 233unifdef-y += if_pppox.h
234unifdef-y += if_shaper.h
235unifdef-y += if_tr.h 234unifdef-y += if_tr.h
236unifdef-y += if_tun.h 235unifdef-y += if_tun.h
237unifdef-y += if_vlan.h 236unifdef-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 @@
1#ifndef __LINUX_SHAPER_H
2#define __LINUX_SHAPER_H
3
4#ifdef __KERNEL__
5
6#define SHAPER_QLEN 10
7/*
8 * This is a bit speed dependent (read it shouldn't be a constant!)
9 *
10 * 5 is about right for 28.8 upwards. Below that double for every
11 * halving of speed or so. - ie about 20 for 9600 baud.
12 */
13#define SHAPER_LATENCY (5*HZ)
14#define SHAPER_MAXSLIP 2
15#define SHAPER_BURST (HZ/50) /* Good for >128K then */
16
17struct shaper
18{
19 struct sk_buff_head sendq;
20 __u32 bytespertick;
21 __u32 bitspersec;
22 __u32 shapelatency;
23 __u32 shapeclock;
24 unsigned long recovery; /* Time we can next clock a packet out on
25 an empty queue */
26 spinlock_t lock;
27 struct net_device *dev;
28 struct net_device_stats* (*get_stats)(struct net_device *dev);
29 struct timer_list timer;
30};
31
32#endif
33
34#define SHAPER_SET_DEV 0x0001
35#define SHAPER_SET_SPEED 0x0002
36#define SHAPER_GET_DEV 0x0003
37#define SHAPER_GET_SPEED 0x0004
38
39struct shaperconf
40{
41 __u16 ss_cmd;
42 union
43 {
44 char ssu_name[14];
45 __u32 ssu_speed;
46 } ss_u;
47#define ss_speed ss_u.ssu_speed
48#define ss_name ss_u.ssu_name
49};
50
51#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-19 04:51:41 -0500