diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-16 12:02:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-16 12:02:15 -0700 |
| commit | cd918afd023a7c213a5b0a397c94c91c96b36e35 (patch) | |
| tree | 5a10ba81a7ebb5fd35c9deb0d09f2da56a3fe7c0 /net/sched | |
| parent | 2f771399a3a2c371c140ff33544a583c6fbc5fd9 (diff) | |
| parent | a5e6a3b0222fb19eaae424226533eadb0be20e93 (diff) | |
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>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_ife.c | 4 | ||||
| -rw-r--r-- | net/sched/sch_fq_codel.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c index 71e7ff22f7c9..c75ea5c9102c 100644 --- a/net/sched/act_ife.c +++ b/net/sched/act_ife.c @@ -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; diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c index 9f3a884d1590..097bbe9857a5 100644 --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c @@ -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, |