projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
net
/
netfilter
/
nf_nat_sip.c
diff --git
a/net/netfilter/nf_nat_sip.c
b/net/netfilter/nf_nat_sip.c
index
f4db3a7
..
16303c7
100644
(file)
--- a/
net/netfilter/nf_nat_sip.c
+++ b/
net/netfilter/nf_nat_sip.c
@@
-542,7
+542,10
@@
static unsigned int nf_nat_sdp_media(struct sk_buff *skb, unsigned int protoff,
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;