From 987913820d6b8350c19378c750e8f883fb39934a Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Wed, 17 Apr 2013 16:49:10 +0000
Subject: [PATCH] --- yaml --- r: 362651 b: refs/heads/master c:
 cb95ec6261a205bde6451b972fbd6e1581608cae h: refs/heads/master i:   362649:
 d777353df638011f4d31ffef1fda6c60f3d8743b   362647:
 8453aab4d964f621dc75122efdd0bc77a8196aef v: v3

---
 [refs]                   | 2 +-
 trunk/net/sched/cls_fw.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 08e6e3d1d1c5..10b91110eedc 100644
--- 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
index 1135d8227f9b..9b97172db84a 100644
--- 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)