diff --git a/[refs] b/[refs]
index 4154b23de39a..8cbac6ca2f66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcdf95cb293603acdff910715c8aa2b19ed29df4
+refs/heads/master: 3a53943b5ae8b61913e2d61e98cbeedf67861c92
diff --git a/trunk/net/sched/cls_flow.c b/trunk/net/sched/cls_flow.c
index 51ff19485e12..1d8bd0dbcd1f 100644
--- a/trunk/net/sched/cls_flow.c
+++ b/trunk/net/sched/cls_flow.c
@@ -285,7 +285,7 @@ static int flow_classify(struct sk_buff *skb, const struct tcf_proto *tp,
 	int r;
 
 	list_for_each_entry(f, &head->filters, list) {
-		u32 keys[f->nkeys];
+		u32 keys[FLOW_KEY_MAX + 1];
 		struct flow_keys flow_keys;
 
 		if (!tcf_em_tree_match(skb, &f->ematches, NULL))