From b604efa7ccdb04e5f568b8c1287b56a96a8482c3 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 22 Sep 2010 08:35:36 +0200
Subject: [PATCH] --- yaml --- r: 215455 b: refs/heads/master c:
 bcac0dfab191cb53b3f9b43c8014a34070ed58ff h: refs/heads/master i:   215453:
 389d6666787a21ed8ee7d0f37be620b56b412e30   215451:
 5736c69b875fa304862f2829f7e10addff6ee630   215447:
 618004709831d63a7cc81c9288db9b7ed7ee1f18   215439:
 22efd73598d118e75df07125c81e399580db75d3   215423:
 a7546c32a4d912d3f95ec866e6be78096d734635 v: v3

---
 [refs]                                     | 2 +-
 trunk/net/netfilter/nf_conntrack_netlink.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4717adff351f..a70af828a3c5 100644
--- 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
index 5bae1cd15eea..37533a30413b 100644
--- 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