diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
| commit | 1540c84b5ed657ed71dce06915bba461e6b09574 (patch) | |
| tree | a449dc166800a1b0c429bb038bfc974e577eaf72 /net/ipv6/udp.c | |
| parent | 1a3a403aa98b0ccabeb12abd7da90d33250ea36b (diff) | |
| parent | 4640b4e7d9919e9629fe8456df94f71658431ef9 (diff) | |
Merge branch '2.6.33.4' into rt/2.6.33
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index d9714d20705d..4f57cd2b353a 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
| @@ -258,8 +258,8 @@ static struct sock *__udp6_lib_lookup(struct net *net, | |||
| 258 | if (hslot->count < hslot2->count) | 258 | if (hslot->count < hslot2->count) |
| 259 | goto begin; | 259 | goto begin; |
| 260 | 260 | ||
| 261 | result = udp6_lib_lookup2(net, &in6addr_any, sport, | 261 | result = udp6_lib_lookup2(net, saddr, sport, |
| 262 | daddr, hnum, dif, | 262 | &in6addr_any, hnum, dif, |
| 263 | hslot2, slot2); | 263 | hslot2, slot2); |
| 264 | } | 264 | } |
| 265 | rcu_read_unlock(); | 265 | rcu_read_unlock(); |