Commit f3d69967 authored by David S. Miller's avatar David S. Miller

Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5

into kernel.bkbits.net:/home/davem/net-2.5
parents 2ab3b6f8 644e3f00
......@@ -575,7 +575,7 @@ static struct sock *udp_v6_mcast_next(struct sock *sk,
for(; s; s = s->next) {
struct inet_opt *inet = inet_sk(s);
if (inet->num == num) {
if (inet->num == num && sk->family == PF_INET6) {
struct ipv6_pinfo *np = inet6_sk(s);
if (inet->dport) {
if (inet->dport != rmt_port)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment