Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (46 commits)
  [NET] ifb: set separate lockdep classes for queue locks
  [IPV6] KCONFIG: Fix description about IPV6_TUNNEL.
  [TCP]: Fix shrinking windows with window scaling
  netpoll: zap_completion_queue: adjust skb->users counter
  bridge: use time_before() in br_fdb_cleanup()
  [TG3]: Fix build warning on sparc32.
  MAINTAINERS: bluez-devel is subscribers-only
  audit: netlink socket can be auto-bound to pid other than current->pid (v2)
  [NET]: Fix permissions of /proc/net
  [SCTP]: Fix a race between module load and protosw access
  [NETFILTER]: ipt_recent: sanity check hit count
  [NETFILTER]: nf_conntrack_h323: logical-bitwise & confusion in process_setup()
  [RT2X00] drivers/net/wireless/rt2x00/rt2x00dev.c: remove dead code, fix warning
  [IPV4]: esp_output() misannotations
  [8021Q]: vlan_dev misannotations
  xfrm: ->eth_proto is __be16
  [IPV4]: ipv4_is_lbcast() misannotations
  [SUNRPC]: net/* NULL noise
  [SCTP]: fix misannotated __sctp_rcv_asconf_lookup()
  [PKT_SCHED]: annotate cls_u32
  ...

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: