diff --git a/[refs] b/[refs]
index ba0c12008839..2f64e7544533 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ea9d70df8f8be741ee0525490370de06163d2de
+refs/heads/master: 4f25049106e0507ff21a9e1fc0645d849e19faf0
diff --git a/trunk/net/sched/cls_flow.c b/trunk/net/sched/cls_flow.c
index 8d7698621f0a..eeb223cf14cf 100644
--- a/trunk/net/sched/cls_flow.c
+++ b/trunk/net/sched/cls_flow.c
@@ -402,12 +402,13 @@ static int flow_change(struct tcf_proto *tp, unsigned long base,
 
 	if (tb[TCA_FLOW_KEYS]) {
 		keymask = nla_get_u32(tb[TCA_FLOW_KEYS]);
-		if (fls(keymask) - 1 > FLOW_KEY_MAX)
-			return -EOPNOTSUPP;
 
 		nkeys = hweight32(keymask);
 		if (nkeys == 0)
 			return -EINVAL;
+
+		if (fls(keymask) - 1 > FLOW_KEY_MAX)
+			return -EOPNOTSUPP;
 	}
 
 	err = tcf_exts_validate(tp, tb, tca[TCA_RATE], &e, &flow_ext_map);