FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-11 20:07:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sched-cleanups'

Browse Source 
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>
This commit is contained in:
David S. Miller 2017-03-16 12:02:15 -07:00
commit cd918afd02
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/sched/act_ife.c
View File

@ -603,8 +603,8 @@ nla_put_failure:
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;

2
net/sched/sch_fq_codel.c
View File

@ -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 @@ begin:
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,