diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 02:03:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 02:03:42 -0400 |
| commit | 3dcbbcda7c5b77c400791b26facd6593c5b176e0 (patch) | |
| tree | 2e7b844c4d450cf43810a6ed0ddd5c702c245a88 /net/ipv6/addrconf.c | |
| parent | c972398b7871d9fb58c6a317786065a7cc6ca4be (diff) | |
| parent | 6fbe59b9569b2c8d5522d182263935c6c86fc40a (diff) | |
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: (160 commits)
[ETHTOOL]: Remove some entries from non-root command list.
[Bluetooth]: Fix section mismatch of bt_sysfs_cleanup()
[Bluetooth]: Don't update disconnect timer for incoming connections
[ETHTOOL]: let mortals use ethtool
[NetLabel]: add audit support for configuration changes
[TCP]: Fix and simplify microsecond rtt sampling
[TCP] tcp-lp: prevent chance for oops
[SUNRPC]: Remove unnecessary check in net/sunrpc/svcsock.c
[IPVS] bug: endianness breakage in ip_vs_ftp
[IPVS]: ipvs annotations
[NETFILTER]: h323 annotations
[NETFILTER]: ipt annotations
[NETFILTER]: NAT annotations
[NETFILTER]: conntrack annotations
[NETFILTER]: netfilter misc annotations
[NET]: Annotate dst_ops protocol
[NET]: is it Andy or Andi ??
[IPVS]: Make sure ip_vs_ftp ports are valid: module_param_array approach
[IPVS]: Reverse valid ip_vs_ftp ports fix: port check approach
[IrDA] stir4200: removing undocumented bits handling
...
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index c18676352397..e03c33b2465b 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -1258,8 +1258,8 @@ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) | |||
| 1258 | { | 1258 | { |
| 1259 | const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; | 1259 | const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; |
| 1260 | const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); | 1260 | const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); |
| 1261 | u32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr; | 1261 | __be32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr; |
| 1262 | u32 sk2_rcv_saddr = inet_rcv_saddr(sk2); | 1262 | __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2); |
| 1263 | int sk_ipv6only = ipv6_only_sock(sk); | 1263 | int sk_ipv6only = ipv6_only_sock(sk); |
| 1264 | int sk2_ipv6only = inet_v6_ipv6only(sk2); | 1264 | int sk2_ipv6only = inet_v6_ipv6only(sk2); |
| 1265 | int addr_type = ipv6_addr_type(sk_rcv_saddr6); | 1265 | int addr_type = ipv6_addr_type(sk_rcv_saddr6); |