Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PKT_SCHED]: RED: Cleanup and remove unnecessary code

Browse source 
Removes the skb trimming code which is not needed since we never
touch the skb upon failure. Removes unnecessary includes,
initializers, and simplifies the code a bit. Removes Jamal's
obsolete email addresses upon his own request.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
This commit is contained in:
Thomas Graf 2005-11-05 21:14:08 +01:00 • committed by Thomas Graf
parent 6a1b63d467
commit dba051f36a
1 changed files with 21 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
net/sched/sch_red.c
View file

@ -9,38 +9,19 @@
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
* *
* Changes: * Changes:
* J Hadi Salim <hadi@nortel.com> 980914: computation fixes * J Hadi Salim 980914: computation fixes
* Alexey Makarenko <makar@phoenix.kharkov.ua> 990814: qave on idle link was calculated incorrectly. * Alexey Makarenko <makar@phoenix.kharkov.ua> 990814: qave on idle link was calculated incorrectly.
* J Hadi Salim <hadi@nortelnetworks.com> 980816: ECN support * J Hadi Salim 980816: ECN support
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/bitops.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/socket.h>
#include <linux/sockios.h>
#include <linux/in.h>
#include <linux/errno.h>
#include <linux/interrupt.h>
#include <linux/if_ether.h>
#include <linux/inet.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/notifier.h>
#include <net/ip.h>
#include <net/route.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <net/sock.h>
#include <net/pkt_sched.h> #include <net/pkt_sched.h>
#include <net/inet_ecn.h> #include <net/inet_ecn.h>
#include <net/dsfield.h>
#include <net/red.h> #include <net/red.h>
@ -70,8 +51,7 @@ static inline int red_use_ecn(struct red_sched_data *q)
return q->flags & TC_RED_ECN; return q->flags & TC_RED_ECN;
} }
static int static int red_enqueue(struct sk_buff *skb, struct Qdisc* sch)
red_enqueue(struct sk_buff *skb, struct Qdisc* sch)
{ {
struct red_sched_data *q = qdisc_priv(sch); struct red_sched_data *q = qdisc_priv(sch);
@ -116,8 +96,7 @@ congestion_drop:
return NET_XMIT_CN; return NET_XMIT_CN;
} }
static int static int red_requeue(struct sk_buff *skb, struct Qdisc* sch)
red_requeue(struct sk_buff *skb, struct Qdisc* sch)
{ {
struct red_sched_data *q = qdisc_priv(sch); struct red_sched_data *q = qdisc_priv(sch);
@ -127,8 +106,7 @@ red_requeue(struct sk_buff *skb, struct Qdisc* sch)
return qdisc_requeue(skb, sch); return qdisc_requeue(skb, sch);
} }
static struct sk_buff * static struct sk_buff * red_dequeue(struct Qdisc* sch)
red_dequeue(struct Qdisc* sch)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct red_sched_data *q = qdisc_priv(sch); struct red_sched_data *q = qdisc_priv(sch);
@ -171,14 +149,16 @@ static void red_reset(struct Qdisc* sch)
static int red_change(struct Qdisc *sch, struct rtattr *opt) static int red_change(struct Qdisc *sch, struct rtattr *opt)
{ {
struct red_sched_data *q = qdisc_priv(sch); struct red_sched_data *q = qdisc_priv(sch);
struct rtattr *tb[TCA_RED_STAB]; struct rtattr *tb[TCA_RED_MAX];
struct tc_red_qopt *ctl; struct tc_red_qopt *ctl;
if (opt == NULL || if (opt == NULL || rtattr_parse_nested(tb, TCA_RED_MAX, opt))
rtattr_parse_nested(tb, TCA_RED_STAB, opt) || return -EINVAL;
tb[TCA_RED_PARMS-1] == 0 || tb[TCA_RED_STAB-1] == 0 ||
if (tb[TCA_RED_PARMS-1] == NULL ||
RTA_PAYLOAD(tb[TCA_RED_PARMS-1]) < sizeof(*ctl) || RTA_PAYLOAD(tb[TCA_RED_PARMS-1]) < sizeof(*ctl) ||
RTA_PAYLOAD(tb[TCA_RED_STAB-1]) < 256) tb[TCA_RED_STAB-1] == NULL ||
RTA_PAYLOAD(tb[TCA_RED_STAB-1]) < RED_STAB_SIZE)
return -EINVAL; return -EINVAL;
ctl = RTA_DATA(tb[TCA_RED_PARMS-1]); ctl = RTA_DATA(tb[TCA_RED_PARMS-1]);
@ -193,6 +173,7 @@ static int red_change(struct Qdisc *sch, struct rtattr *opt)
if (skb_queue_empty(&sch->q)) if (skb_queue_empty(&sch->q))
red_end_of_idle_period(&q->parms); red_end_of_idle_period(&q->parms);
sch_tree_unlock(sch); sch_tree_unlock(sch);
return 0; return 0;
} }
@ -205,8 +186,7 @@ static int red_init(struct Qdisc* sch, struct rtattr *opt)
static int red_dump(struct Qdisc *sch, struct sk_buff *skb) static int red_dump(struct Qdisc *sch, struct sk_buff *skb)
{ {
struct red_sched_data *q = qdisc_priv(sch); struct red_sched_data *q = qdisc_priv(sch);
unsigned char *b = skb->tail; struct rtattr *opts = NULL;
struct rtattr *rta;
struct tc_red_qopt opt = { struct tc_red_qopt opt = {
.limit = q->limit, .limit = q->limit,
.flags = q->flags, .flags = q->flags,
@ -217,16 +197,12 @@ static int red_dump(struct Qdisc *sch, struct sk_buff *skb)
.Scell_log = q->parms.Scell_log, .Scell_log = q->parms.Scell_log,
}; };
rta = (struct rtattr*)b; opts = RTA_NEST(skb, TCA_OPTIONS);
RTA_PUT(skb, TCA_OPTIONS, 0, NULL);
RTA_PUT(skb, TCA_RED_PARMS, sizeof(opt), &opt); RTA_PUT(skb, TCA_RED_PARMS, sizeof(opt), &opt);
rta->rta_len = skb->tail - b; return RTA_NEST_END(skb, opts);
return skb->len;
rtattr_failure: rtattr_failure:
skb_trim(skb, b - skb->data); return RTA_NEST_CANCEL(skb, opts);
return -1;
} }
static int red_dump_stats(struct Qdisc *sch, struct gnet_dump *d) static int red_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
@ -243,8 +219,6 @@ static int red_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
} }
static struct Qdisc_ops red_qdisc_ops = { static struct Qdisc_ops red_qdisc_ops = {
.next = NULL,
.cl_ops = NULL,
.id = "red", .id = "red",
.priv_size = sizeof(struct red_sched_data), .priv_size = sizeof(struct red_sched_data),
.enqueue = red_enqueue, .enqueue = red_enqueue,
@ -263,10 +237,13 @@ static int __init red_module_init(void)
{ {
return register_qdisc(&red_qdisc_ops); return register_qdisc(&red_qdisc_ops);
} }
static void __exit red_module_exit(void)
static void __exit red_module_exit(void)
{ {
unregister_qdisc(&red_qdisc_ops); unregister_qdisc(&red_qdisc_ops);
} }
module_init(red_module_init) module_init(red_module_init)
module_exit(red_module_exit) module_exit(red_module_exit)
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");