Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd918afd authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sched-cleanups' 



Or Gerlitz says:

====================
small set of sched cleanups

Just two cleanups -- but for the 2nd one I think we need ack from
Cong Wang to make sure this isn't actually a bug report..

changes from V1:
  - addressed comment from Sergei to use 12 hex digits etc
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2f771399 a5e6a3b0

net/sched/act_ife.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -603,7 +603,7 @@ static int tcf_ife_dump(struct sk_buff *skb, struct tc_action *a, int bind, 
	return -1;

	return -1;

}

}





int find_decode_metaid(struct sk_buff *skb, struct tcf_ife_info *ife,

static int find_decode_metaid(struct sk_buff *skb, struct tcf_ife_info *ife,

			      u16 metaid, u16 mlen, void *mdata)

			      u16 metaid, u16 mlen, void *mdata)

{

{

	struct tcf_meta_info *e;

	struct tcf_meta_info *e;

net/sched/sch_fq_codel.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -288,7 +288,6 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch) 
	struct fq_codel_flow *flow;

	struct fq_codel_flow *flow;

	struct list_head *head;

	struct list_head *head;

	u32 prev_drop_count, prev_ecn_mark;

	u32 prev_drop_count, prev_ecn_mark;

	unsigned int prev_backlog;





begin:

begin:

	head = &q->new_flows;

	head = &q->new_flows;
@@ -307,7 +306,6 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch) 




	prev_drop_count = q->cstats.drop_count;

	prev_drop_count = q->cstats.drop_count;

	prev_ecn_mark = q->cstats.ecn_mark;

	prev_ecn_mark = q->cstats.ecn_mark;

	prev_backlog = sch->qstats.backlog;





	skb = codel_dequeue(sch, &sch->qstats.backlog, &q->cparams,

	skb = codel_dequeue(sch, &sch->qstats.backlog, &q->cparams,

			    &flow->cvars, &q->cstats, qdisc_pkt_len,

			    &flow->cvars, &q->cstats, qdisc_pkt_len,