diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 08:30:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 08:30:22 -0800 |
| commit | 8edf51a5ee38eb40de5449e131fd36450a229430 (patch) | |
| tree | d2c5cd3b9a16a09a933ec345e12eb9272bcd0e67 /net/ipv4/af_inet.c | |
| parent | b3277dfaf0257221f83dd861b82c54de4507473e (diff) | |
| parent | 483479ecc565b7f5845997138eddf5ecbc2684b1 (diff) | |
| download | linux-8edf51a5ee38eb40de5449e131fd36450a229430.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4] devinet: inetdev_init out label moved after RCU assignment
[INET]: style updates for the inet_sock->is_icsk assignment fix
[SCTP]: Fix err_hdr assignment in sctp_init_cause.
[NETFILTER]: tcp conntrack: fix IP_CT_TCP_FLAG_CLOSE_INIT value
[NETFILTER]: nf_nat: fix hanging connections when loading the NAT module
[NETFILTER]: arp_tables: fix userspace compilation
[NETFILTER]: nf_conntrack_ipv6: fix crash when handling fragments
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index d60fd7321e63..864009643675 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -305,7 +305,7 @@ lookup_protocol: sk->sk_reuse = 1; inet = inet_sk(sk); - inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) == INET_PROTOSW_ICSK; + inet->is_icsk = (INET_PROTOSW_ICSK & answer_flags) != 0; if (SOCK_RAW == sock->type) { inet->num = protocol; |