---

yaml --- r: 362651 b: refs/heads/master c: cb95ec6 h: refs/heads/master i: 362649: d777353 362647: 8453aab v: v3
git-mirror · Apr 19, 2013 · 9879138 · 9879138
1 parent 4df991a
commit 9879138
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e15465e1808542743627f13d1c0cbb7eacc82b83
+refs/heads/master: cb95ec6261a205bde6451b972fbd6e1581608cae
diff --git a/trunk/net/sched/cls_fw.c b/trunk/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)