---

yaml --- r: 215455 b: refs/heads/master c: bcac0df h: refs/heads/master i: 215453: 389d666 215451: 5736c69 215447: 6180047 215439: 22efd73 215423: a7546c3 v: v3
git-mirror · Sep 22, 2010 · b604efa · b604efa
1 parent 77dd862
commit b604efa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b92b61f3891517d18d0573ad2c939c81b59ecfe
+refs/heads/master: bcac0dfab191cb53b3f9b43c8014a34070ed58ff
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -1733,6 +1733,7 @@ static const struct nla_policy exp_nla_policy[CTA_EXPECT_MAX+1] = {
 	[CTA_EXPECT_TIMEOUT]	= { .type = NLA_U32 },
 	[CTA_EXPECT_ID]		= { .type = NLA_U32 },
 	[CTA_EXPECT_HELP_NAME]	= { .type = NLA_NUL_STRING },
+	[CTA_EXPECT_ZONE]	= { .type = NLA_U16 },
 };
 
 static int