aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-08-27 15:16:16 -0700
committerDavid S. Miller <davem@davemloft.net>2018-08-27 15:16:16 -0700
commitca2b1d2d4271209060a1c9e8e1ffb06fbecc812b (patch)
tree7de48667acf0c9b155da55796963d92b37d0ac7a
parenterspan: set erspan_ver to 1 by default when adding an erspan dev (diff)
parentnet: sched: return -ENOENT when trying to remove filter from non-existent chain (diff)
downloadlinux-dev-ca2b1d2d4271209060a1c9e8e1ffb06fbecc812b.tar.xz
linux-dev-ca2b1d2d4271209060a1c9e8e1ffb06fbecc812b.zip
Merge branch 'net-sched-fixes'
Jiri Pirko says: ==================== net: sched: couple of small fixes 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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/cls_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 31bd1439cf60..1a67af8a6e8c 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -1252,7 +1252,7 @@ replay:
}
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;
}
@@ -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;
}