projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into...
[deliverable/linux.git]
/
net
/
ipv4
/
netfilter
/
nf_nat_sip.c
diff --git
a/net/ipv4/netfilter/nf_nat_sip.c
b/net/ipv4/netfilter/nf_nat_sip.c
index 4ad9cf1739922cfb4b13d3135d01381dd70bf0be..9c87cde28ff831472cc7072a05526d753727d1fa 100644
(file)
--- 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;
This page took
0.037872 seconds
and
5
git commands to generate.