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

into kernel.bkbits.net:/home/davem/net-2.5

net/ipv6/udp.c

@@ -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)