mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 18:07:03 +00:00
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: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
cd918afd02
@ -603,8 +603,8 @@ nla_put_failure:
|
||||
return -1;
|
||||
}
|
||||
|
||||
int find_decode_metaid(struct sk_buff *skb, struct tcf_ife_info *ife,
|
||||
u16 metaid, u16 mlen, void *mdata)
|
||||
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;
|
||||
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user