git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_helper_h323.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_helper_h323.c
b/net/ipv4/netfilter/ip_conntrack_helper_h323.c
index
518f581
..
853a3d5
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_helper_h323.c
+++ b/
net/ipv4/netfilter/ip_conntrack_helper_h323.c
@@
-1092,7
+1092,7
@@
static struct ip_conntrack_expect *find_expect(struct ip_conntrack *ct,
tuple.dst.protonum = IPPROTO_TCP;
exp = __ip_conntrack_expect_find(&tuple);
- if (exp->master == ct)
+ if (exp
&& exp
->master == ct)
return exp;
return NULL;
}