From 451a461f5a3f70dbd0f801ce8f426700238967db Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Wed, 29 Aug 2012 15:24:09 +0000
Subject: [PATCH] --- yaml --- r: 322448 b: refs/heads/master c:
 3f509c689a07a4aa989b426893d8491a7ffcc410 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 95e2b8f19667..d38a050fccd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fc09f10f12477bdaa54e94f9cb428bef6d81315
+refs/heads/master: 3f509c689a07a4aa989b426893d8491a7ffcc410
diff --git a/trunk/net/ipv4/netfilter/nf_nat_sip.c b/trunk/net/ipv4/netfilter/nf_nat_sip.c
index 4ad9cf173992..9c87cde28ff8 100644
--- a/trunk/net/ipv4/netfilter/nf_nat_sip.c
+++ b/trunk/net/ipv4/netfilter/nf_nat_sip.c
@@ -502,7 +502,10 @@ static unsigned int ip_nat_sdp_media(struct sk_buff *skb, unsigned int dataoff,
 		ret = nf_ct_expect_related(rtcp_exp);
 		if (ret == 0)
 			break;
-		else if (ret != -EBUSY) {
+		else if (ret == -EBUSY) {
+			nf_ct_unexpect_related(rtp_exp);
+			continue;
+		} else if (ret < 0) {
 			nf_ct_unexpect_related(rtp_exp);
 			port = 0;
 			break;