Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 5 insertions, 4 deletions

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: