From d2524b7a9b0a50031654279190053053e137592e Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 9 Nov 2005 13:03:09 -0800
Subject: [PATCH] --- yaml --- r: 13648 b: refs/heads/master c:
 fe902a91ff427af7dbf20e7c196623b2a4eade13 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c1daa1cc45e2..b5ce4a18fe22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d63a92810807e8da298895236f2b99697e884014
+refs/heads/master: fe902a91ff427af7dbf20e7c196623b2a4eade13
diff --git a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
index d1dde1417ef7..cfc5487e627a 100644
--- a/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
+++ b/trunk/net/ipv4/netfilter/ip_conntrack_netlink.c
@@ -593,7 +593,7 @@ static int ctnetlink_parse_nat_proto(struct nfattr *attr,
 	nfattr_parse_nested(tb, CTA_PROTONAT_MAX, attr);
 
 	if (nfattr_bad_size(tb, CTA_PROTONAT_MAX, cta_min_protonat))
-		return -1;
+		return -EINVAL;
 
 	npt = ip_nat_proto_find_get(ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum);
 	if (!npt)