Merge branch 'sched-cleanups' (cd918afd) · Commits · 戴 / test

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:

David S. Miller <davem@davemloft.net>

net/sched/act_ife.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -603,7 +603,7 @@ nla_put_failure:
		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)
		{
		struct tcf_meta_info *e;

net/sched/sch_fq_codel.c

+0 −2

Original line number	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 list_head *head;
		u32 prev_drop_count, prev_ecn_mark;
		unsigned int prev_backlog;

		begin:
		head = &q->new_flows;
		@@ -307,7 +306,6 @@ begin:

		prev_drop_count = q->cstats.drop_count;
		prev_ecn_mark = q->cstats.ecn_mark;
		prev_backlog = sch->qstats.backlog;

		skb = codel_dequeue(sch, &sch->qstats.backlog, &q->cparams,
		&flow->cvars, &q->cstats, qdisc_pkt_len,

Admin message