[PATCH net-next V2 0/2] small set of sched cleanups

[PATCH net-next V2 0/2] small set of sched cleanups

[Or Gerlitz]

Hi Dave,

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..

Or.

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


Or Gerlitz (2):
  net/sched: act_ife: Staticfy find_decode_metaid()
  net/sched: fq_codel: Avoid set-but-unused variable

 net/sched/act_ife.c      | 4 ++--
 net/sched/sch_fq_codel.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

-- 
2.3.7

[PATCH net-next V2 1/2] net/sched: act_ife: Staticfy find_decode_metaid()

[Or Gerlitz]

As it's used only on that file.

Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
 net/sched/act_ife.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/sched/act_ife.c b/net/sched/act_ife.c
index 71e7ff22..c75ea5c 100644
--- a/net/sched/act_ife.c
+++ b/net/sched/act_ife.c
@@ -603,8 +603,8 @@ static int tcf_ife_dump(struct sk_buff *skb, struct tc_action *a, int bind,
 	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;
 
-- 
2.3.7

[PATCH net-next V2 2/2] net/sched: fq_codel: Avoid set-but-unused variable

[Or Gerlitz]

The code introduced by commit 2ccccf5fb43f ("net_sched: update
hierarchical backlog too") only sets prev_backlog in fq_codel_dequeue()
but not using that anywhere, remove that setting.

Cc: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
---
 net/sched/sch_fq_codel.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c
index 9f3a884..097bbe9 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 @@ static struct sk_buff *fq_codel_dequeue(struct Qdisc *sch)
 
 	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,
-- 
2.3.7

Re: [PATCH net-next V2 2/2] net/sched: fq_codel: Avoid set-but-unused variable

[Eric Dumazet]

On Thu, 2017-03-16 at 12:53 +0200, Or Gerlitz wrote:
> The code introduced by commit 2ccccf5fb43f ("net_sched: update
> hierarchical backlog too") only sets prev_backlog in fq_codel_dequeue()
> but not using that anywhere, remove that setting.
> 
> Cc: Cong Wang <xiyou.wangcong@gmail.com>
> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
> ---
>  net/sched/sch_fq_codel.c | 2 --
>  1 file changed, 2 deletions(-)

Acked-by: Eric Dumazet <edumazet@google.com>

Thanks !

Re: [PATCH net-next V2 0/2] small set of sched cleanups

[Cong Wang]

On Thu, Mar 16, 2017 at 3:53 AM, Or Gerlitz <ogerlitz@mellanox.com> wrote:
> Hi Dave,
>
> 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..
>
> Or.
>
> changes from V1:
>   - addressed comment from Sergei to use 12 hex digits etc
>

Both look good.

Acked-by: Cong Wang <xiyou.wangcong@gmail.com>

Thanks.

Re: [PATCH net-next V2 0/2] small set of sched cleanups

[David Miller]

From: Or Gerlitz <ogerlitz@mellanox.com>
Date: Thu, 16 Mar 2017 12:53:40 +0200

> 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

Series applied since Eric Dumazet reviewed and ACK's patch #2,
although I still want Cong to take a look at it.

Thanks.

Re: [PATCH net-next V2 0/2] small set of sched cleanups

[Cong Wang]

On Thu, Mar 16, 2017 at 12:02 PM, David Miller <davem@davemloft.net> wrote:
> From: Or Gerlitz <ogerlitz@mellanox.com>
> Date: Thu, 16 Mar 2017 12:53:40 +0200
>
>> 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
>
> Series applied since Eric Dumazet reviewed and ACK's patch #2,
> although I still want Cong to take a look at it.

I already did and gave an Ack. Is it lost?