Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index e7c9e4e7232..bb3cbe5ec36 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -583,7 +583,7 @@ static int do_ip_setsockopt(struct sock *sk, int level,
                 }
 
                 if (!mreq.imr_ifindex) {
-                        if (mreq.imr_address.s_addr == INADDR_ANY) {
+                        if (mreq.imr_address.s_addr == htonl(INADDR_ANY)) {
                                 inet->mc_index = 0;
                                 inet->mc_addr  = 0;
                                 err = 0;