From 0986ac970e2d20a7fd0093f33990b8a83e3a2767 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Fri, 23 Dec 2011 14:00:30 +0100
Subject: [PATCH] --- yaml --- r: 279070 b: refs/heads/master c:
 329fb58a93b25f0f5ee9d80c0e0e6a6c1a0192b4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d509e177d55a..a23cb8025170 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d4e61c6ca683cdc0ea07d39c80cc8d6d478b31e
+refs/heads/master: 329fb58a93b25f0f5ee9d80c0e0e6a6c1a0192b4
diff --git a/trunk/net/ipv4/netfilter/nf_nat_core.c b/trunk/net/ipv4/netfilter/nf_nat_core.c
index 76600f8d434b..610eb4499a1a 100644
--- a/trunk/net/ipv4/netfilter/nf_nat_core.c
+++ b/trunk/net/ipv4/netfilter/nf_nat_core.c
@@ -622,6 +622,7 @@ static int nfnetlink_parse_nat_proto(struct nlattr *attr,
 static const struct nla_policy nat_nla_policy[CTA_NAT_MAX+1] = {
 	[CTA_NAT_MINIP]		= { .type = NLA_U32 },
 	[CTA_NAT_MAXIP]		= { .type = NLA_U32 },
+	[CTA_NAT_PROTO]		= { .type = NLA_NESTED },
 };
 
 static int