From de274bfdde8aada158d7c715e914a35290745c4b Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 15 Nov 2010 18:45:12 +0100 Subject: [PATCH] --- yaml --- r: 236573 b: refs/heads/master c: ab0cba25128e1435a59b1ec4ae0c7505548fed87 h: refs/heads/master i: 236571: 90f4fb21730b9b1f32a70ea1c935ede3e3771532 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/nf_nat_amanda.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dd096ef3b9ca..c4055f8aedef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb733162ae4f69b93f7c08012e6e239f31796de8 +refs/heads/master: ab0cba25128e1435a59b1ec4ae0c7505548fed87 diff --git a/trunk/net/ipv4/netfilter/nf_nat_amanda.c b/trunk/net/ipv4/netfilter/nf_nat_amanda.c index 0f23b3f06df0..703f366fd235 100644 --- a/trunk/net/ipv4/netfilter/nf_nat_amanda.c +++ b/trunk/net/ipv4/netfilter/nf_nat_amanda.c @@ -44,13 +44,13 @@ static unsigned int help(struct sk_buff *skb, /* Try to get same port: if not, try to change it. */ for (port = ntohs(exp->saved_proto.tcp.port); port != 0; port++) { - int ret; + int res; exp->tuple.dst.u.tcp.port = htons(port); - ret = nf_ct_expect_related(exp); - if (ret == 0) + res = nf_ct_expect_related(exp); + if (res == 0) break; - else if (ret != -EBUSY) { + else if (res != -EBUSY) { port = 0; break; }