4 files changed, 8 insertions, 7 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 09ca5293d08f..0d109504ed86 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -458,7 +458,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
         err = -EADDRNOTAVAIL;
         if (!sysctl_ip_nonlocal_bind &&
             !inet->freebind &&
-            addr->sin_addr.s_addr != INADDR_ANY &&
+            addr->sin_addr.s_addr != htonl(INADDR_ANY) &&
             chk_addr_ret != RTN_LOCAL &&
             chk_addr_ret != RTN_MULTICAST &&
             chk_addr_ret != RTN_BROADCAST)
diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 091e6709f831..f3ceca31aa45 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -168,7 +168,7 @@ static int esp_output(struct xfrm_state *x, struct sk_buff *skb)
                 struct xfrm_encap_tmpl *encap = x->encap;
                 struct udphdr *uh;
                 __be32 *udpdata32;
-                unsigned int sport, dport;
+                __be16 sport, dport;
                 int encap_type;
 
                 spin_lock_bh(&x->lock);
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index de0572c88859..f72457b4b0a7 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;
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 5dd938579eeb..7c992fbbc2c3 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -103,6 +103,7 @@
                                            - '3' from resolv.h */
 
 #define NONE __constant_htonl(INADDR_NONE)
+#define ANY __constant_htonl(INADDR_ANY)
 
 /*
  * Public IP configuration
@@ -1479,19 +1480,19 @@ static int __init ip_auto_config_setup(char *addrs)
                         DBG(("IP-Config: Parameter #%d: `%s'\n", num, ip));
                         switch (num) {
                         case 0:
-                                if ((ic_myaddr = in_aton(ip)) == INADDR_ANY)
+                                if ((ic_myaddr = in_aton(ip)) == ANY)
                                         ic_myaddr = NONE;
                                 break;
                         case 1:
-                                if ((ic_servaddr = in_aton(ip)) == INADDR_ANY)
+                                if ((ic_servaddr = in_aton(ip)) == ANY)
                                         ic_servaddr = NONE;
                                 break;
                         case 2:
-                                if ((ic_gateway = in_aton(ip)) == INADDR_ANY)
+                                if ((ic_gateway = in_aton(ip)) == ANY)
                                         ic_gateway = NONE;
                                 break;
                         case 3:
-                                if ((ic_netmask = in_aton(ip)) == INADDR_ANY)
+                                if ((ic_netmask = in_aton(ip)) == ANY)
                                         ic_netmask = NONE;
                                 break;
                         case 4: