diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-31 17:06:37 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-31 17:06:37 (GMT) |
commit | 0dcd5052c8543ef999bcd252cee50b7ae8111e89 (patch) | |
tree | 1b10a35334ec660f8fe021ce9cdeb08bb65fc839 /net/ipv4 | |
parent | 14a15d618743ebc4936fe03073bf0c75024d3a07 (diff) | |
parent | 5b423f6a40a0327f9d40bc8b97ce9be266f74368 (diff) | |
download | linux-fsl-qoriq-0dcd5052c8543ef999bcd252cee50b7ae8111e89.tar.xz |
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/nf_nat_sip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/nf_nat_sip.c b/net/ipv4/netfilter/nf_nat_sip.c index 4ad9cf1..9c87cde 100644 --- a/net/ipv4/netfilter/nf_nat_sip.c +++ b/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; |