diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-17 16:49:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-19 17:34:53 -0400 |
| commit | cb95ec6261a205bde6451b972fbd6e1581608cae (patch) | |
| tree | 9b1d579fab54f5759dab9386f3ba42523f20f688 | |
| parent | e15465e1808542743627f13d1c0cbb7eacc82b83 (diff) | |
| download | linux-3.10-cb95ec6261a205bde6451b972fbd6e1581608cae.tar.gz linux-3.10-cb95ec6261a205bde6451b972fbd6e1581608cae.tar.bz2 linux-3.10-cb95ec6261a205bde6451b972fbd6e1581608cae.zip | |
pkt_sched: fix error return code in fw_change_attrs()
Fix to return -EINVAL when tb[TCA_FW_MASK] is set and head->mask != 0xFFFFFFFF
instead of 0 (ifdef CONFIG_NET_CLS_IND and tb[TCA_FW_INDEV]), as done elsewhere
in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/cls_fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index 1135d8227f9..9b97172db84 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c @@ -204,7 +204,6 @@ fw_change_attrs(struct net *net, struct tcf_proto *tp, struct fw_filter *f, if (err < 0) return err; - err = -EINVAL; if (tb[TCA_FW_CLASSID]) { f->res.classid = nla_get_u32(tb[TCA_FW_CLASSID]); tcf_bind_filter(tp, &f->res, base); @@ -218,6 +217,7 @@ fw_change_attrs(struct net *net, struct tcf_proto *tp, struct fw_filter *f, } #endif /* CONFIG_NET_CLS_IND */ + err = -EINVAL; if (tb[TCA_FW_MASK]) { mask = nla_get_u32(tb[TCA_FW_MASK]); if (mask != head->mask) |