net_sched: cleanups
Cleanup net/sched code to current CodingStyle and practices. Reduce inline abuse Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
7180a03118
commit
cc7ec456f8
@@ -36,8 +36,7 @@
|
||||
if RED works correctly.
|
||||
*/
|
||||
|
||||
struct red_sched_data
|
||||
{
|
||||
struct red_sched_data {
|
||||
u32 limit; /* HARD maximal queue length */
|
||||
unsigned char flags;
|
||||
struct red_parms parms;
|
||||
@@ -55,7 +54,7 @@ static inline int red_use_harddrop(struct red_sched_data *q)
|
||||
return q->flags & TC_RED_HARDDROP;
|
||||
}
|
||||
|
||||
static int red_enqueue(struct sk_buff *skb, struct Qdisc* sch)
|
||||
static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch)
|
||||
{
|
||||
struct red_sched_data *q = qdisc_priv(sch);
|
||||
struct Qdisc *child = q->qdisc;
|
||||
@@ -67,29 +66,29 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc* sch)
|
||||
red_end_of_idle_period(&q->parms);
|
||||
|
||||
switch (red_action(&q->parms, q->parms.qavg)) {
|
||||
case RED_DONT_MARK:
|
||||
break;
|
||||
case RED_DONT_MARK:
|
||||
break;
|
||||
|
||||
case RED_PROB_MARK:
|
||||
sch->qstats.overlimits++;
|
||||
if (!red_use_ecn(q) || !INET_ECN_set_ce(skb)) {
|
||||
q->stats.prob_drop++;
|
||||
goto congestion_drop;
|
||||
}
|
||||
case RED_PROB_MARK:
|
||||
sch->qstats.overlimits++;
|
||||
if (!red_use_ecn(q) || !INET_ECN_set_ce(skb)) {
|
||||
q->stats.prob_drop++;
|
||||
goto congestion_drop;
|
||||
}
|
||||
|
||||
q->stats.prob_mark++;
|
||||
break;
|
||||
q->stats.prob_mark++;
|
||||
break;
|
||||
|
||||
case RED_HARD_MARK:
|
||||
sch->qstats.overlimits++;
|
||||
if (red_use_harddrop(q) || !red_use_ecn(q) ||
|
||||
!INET_ECN_set_ce(skb)) {
|
||||
q->stats.forced_drop++;
|
||||
goto congestion_drop;
|
||||
}
|
||||
case RED_HARD_MARK:
|
||||
sch->qstats.overlimits++;
|
||||
if (red_use_harddrop(q) || !red_use_ecn(q) ||
|
||||
!INET_ECN_set_ce(skb)) {
|
||||
q->stats.forced_drop++;
|
||||
goto congestion_drop;
|
||||
}
|
||||
|
||||
q->stats.forced_mark++;
|
||||
break;
|
||||
q->stats.forced_mark++;
|
||||
break;
|
||||
}
|
||||
|
||||
ret = qdisc_enqueue(skb, child);
|
||||
@@ -107,7 +106,7 @@ congestion_drop:
|
||||
return NET_XMIT_CN;
|
||||
}
|
||||
|
||||
static struct sk_buff * red_dequeue(struct Qdisc* sch)
|
||||
static struct sk_buff *red_dequeue(struct Qdisc *sch)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
struct red_sched_data *q = qdisc_priv(sch);
|
||||
@@ -122,7 +121,7 @@ static struct sk_buff * red_dequeue(struct Qdisc* sch)
|
||||
return skb;
|
||||
}
|
||||
|
||||
static struct sk_buff * red_peek(struct Qdisc* sch)
|
||||
static struct sk_buff *red_peek(struct Qdisc *sch)
|
||||
{
|
||||
struct red_sched_data *q = qdisc_priv(sch);
|
||||
struct Qdisc *child = q->qdisc;
|
||||
@@ -130,7 +129,7 @@ static struct sk_buff * red_peek(struct Qdisc* sch)
|
||||
return child->ops->peek(child);
|
||||
}
|
||||
|
||||
static unsigned int red_drop(struct Qdisc* sch)
|
||||
static unsigned int red_drop(struct Qdisc *sch)
|
||||
{
|
||||
struct red_sched_data *q = qdisc_priv(sch);
|
||||
struct Qdisc *child = q->qdisc;
|
||||
@@ -149,7 +148,7 @@ static unsigned int red_drop(struct Qdisc* sch)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void red_reset(struct Qdisc* sch)
|
||||
static void red_reset(struct Qdisc *sch)
|
||||
{
|
||||
struct red_sched_data *q = qdisc_priv(sch);
|
||||
|
||||
@@ -216,7 +215,7 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int red_init(struct Qdisc* sch, struct nlattr *opt)
|
||||
static int red_init(struct Qdisc *sch, struct nlattr *opt)
|
||||
{
|
||||
struct red_sched_data *q = qdisc_priv(sch);
|
||||
|
||||
|
Reference in New Issue
Block a user