[patch net 0/2] net: sched: couple of small fixes

[patch net 0/2] net: sched: couple of small fixes

[Jiri Pirko]

From: Jiri Pirko <jiri@mellanox.com>

Jiri Pirko (2):
  net: sched: fix extack error message when chain is failed to be
    created
  net: sched: return -ENOENT when trying to remove filter from
    non-existent chain

 net/sched/cls_api.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.14.4

[patch net 1/2] net: sched: fix extack error message when chain is failed to be created

[Jiri Pirko]

From: Jiri Pirko <jiri@mellanox.com>

Instead "Cannot find" say "Cannot create".

Fixes: c35a4acc2985 ("net: sched: cls_api: handle generic cls errors")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
 net/sched/cls_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 31bd1439cf60..2d41c5b21b48 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1252,7 +1252,7 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
 	}
 	chain = tcf_chain_get(block, chain_index, true);
 	if (!chain) {
-		NL_SET_ERR_MSG(extack, "Cannot find specified filter chain");
+		NL_SET_ERR_MSG(extack, "Cannot create specified filter chain");
 		err = -ENOMEM;
 		goto errout;
 	}
-- 
2.14.4

[patch net 2/2] net: sched: return -ENOENT when trying to remove filter from non-existent chain

[Jiri Pirko]

From: Jiri Pirko <jiri@mellanox.com>

When chain 0 was implicitly created, removal of non-existent filter from
chain 0 gave -ENOENT. Once chain 0 became non-implicit, the same call is
giving -EINVAL. Fix this by returning -ENOENT in that case.

Reported-by: Roman Mashak <mrv@mojatatu.com>
Fixes: f71e0ca4db18 ("net: sched: Avoid implicit chain 0 creation")
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
 net/sched/cls_api.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 2d41c5b21b48..1a67af8a6e8c 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1399,7 +1399,7 @@ static int tc_del_tfilter(struct sk_buff *skb, struct nlmsghdr *n,
 			goto errout;
 		}
 		NL_SET_ERR_MSG(extack, "Cannot find specified filter chain");
-		err = -EINVAL;
+		err = -ENOENT;
 		goto errout;
 	}
 
-- 
2.14.4

Re: [patch net 0/2] net: sched: couple of small fixes

[Cong Wang]

On Mon, Aug 27, 2018 at 11:58 AM Jiri Pirko <jiri@resnulli.us> wrote:
>
> From: Jiri Pirko <jiri@mellanox.com>
>
> Jiri Pirko (2):
>   net: sched: fix extack error message when chain is failed to be
>     created
>   net: sched: return -ENOENT when trying to remove filter from
>     non-existent chain

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

Re: [patch net 0/2] net: sched: couple of small fixes

[David Miller]

From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Mon, 27 Aug 2018 13:44:56 -0700

> On Mon, Aug 27, 2018 at 11:58 AM Jiri Pirko <jiri@resnulli.us> wrote:
>>
>> From: Jiri Pirko <jiri@mellanox.com>
>>
>> Jiri Pirko (2):
>>   net: sched: fix extack error message when chain is failed to be
>>     created
>>   net: sched: return -ENOENT when trying to remove filter from
>>     non-existent chain
> 
> Acked-by: Cong Wang <xiyou.wangcong@gmail.com>

Series applied.