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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

10 files changed, 33 insertions, 34 deletions

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 32e489118beb..d7d2bed7a699 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -96,9 +96,9 @@ static int rxrpc_validate_address(struct rxrpc_sock *rx,
 
         switch (srx->transport.family) {
         case AF_INET:
-                _debug("INET: %x @ %u.%u.%u.%u",
+                _debug("INET: %x @ %pI4",
                        ntohs(srx->transport.sin.sin_port),
-                       NIPQUAD(srx->transport.sin.sin_addr));
+                       &srx->transport.sin.sin_addr);
                 if (srx->transport_len > 8)
                         memset((void *)&srx->transport + 8, 0,
                                srx->transport_len - 8);
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
index 3869a5866752..0f1218b8d289 100644
--- a/net/rxrpc/ar-connection.c
+++ b/net/rxrpc/ar-connection.c
@@ -826,7 +826,7 @@ static void rxrpc_destroy_connection(struct rxrpc_connection *conn)
 /*
  * reap dead connections
  */
-void rxrpc_connection_reaper(struct work_struct *work)
+static void rxrpc_connection_reaper(struct work_struct *work)
 {
         struct rxrpc_connection *conn, *_p;
         unsigned long now, earliest, reap_time;
diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
index 1ada43d51165..dc5cb1e19509 100644
--- a/net/rxrpc/ar-connevent.c
+++ b/net/rxrpc/ar-connevent.c
@@ -126,7 +126,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
  * mark a call as being on a now-secured channel
  * - must be called with softirqs disabled
  */
-void rxrpc_call_is_secure(struct rxrpc_call *call)
+static void rxrpc_call_is_secure(struct rxrpc_call *call)
 {
         _enter("%p", call);
         if (call) {
diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
index 6cb3e8890e7e..d4d1ae26d293 100644
--- a/net/rxrpc/ar-error.c
+++ b/net/rxrpc/ar-error.c
@@ -49,8 +49,7 @@ void rxrpc_UDP_error_report(struct sock *sk)
         addr = *(__be32 *)(skb_network_header(skb) + serr->addr_offset);
         port = serr->port;
 
-        _net("Rx UDP Error from "NIPQUAD_FMT":%hu",
-             NIPQUAD(addr), ntohs(port));
+        _net("Rx UDP Error from %pI4:%hu", &addr, ntohs(port));
         _debug("Msg l:%d d:%d", skb->len, skb->data_len);
 
         peer = rxrpc_find_peer(local, addr, port);
diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
index f3a2bd747a8f..807535ff29b5 100644
--- a/net/rxrpc/ar-local.c
+++ b/net/rxrpc/ar-local.c
@@ -131,10 +131,10 @@ struct rxrpc_local *rxrpc_lookup_local(struct sockaddr_rxrpc *srx)
         struct rxrpc_local *local;
         int ret;
 
-        _enter("{%d,%u,%u.%u.%u.%u+%hu}",
+        _enter("{%d,%u,%pI4+%hu}",
                srx->transport_type,
                srx->transport.family,
-               NIPQUAD(srx->transport.sin.sin_addr),
+               &srx->transport.sin.sin_addr,
                ntohs(srx->transport.sin.sin_port));
 
         down_write(&rxrpc_local_sem);
@@ -143,10 +143,10 @@ struct rxrpc_local *rxrpc_lookup_local(struct sockaddr_rxrpc *srx)
         read_lock_bh(&rxrpc_local_lock);
 
         list_for_each_entry(local, &rxrpc_locals, link) {
-                _debug("CMP {%d,%u,%u.%u.%u.%u+%hu}",
+                _debug("CMP {%d,%u,%pI4+%hu}",
                        local->srx.transport_type,
                        local->srx.transport.family,
-                       NIPQUAD(local->srx.transport.sin.sin_addr),
+                       &local->srx.transport.sin.sin_addr,
                        ntohs(local->srx.transport.sin.sin_port));
 
                 if (local->srx.transport_type != srx->transport_type ||
@@ -188,11 +188,11 @@ struct rxrpc_local *rxrpc_lookup_local(struct sockaddr_rxrpc *srx)
 
         up_write(&rxrpc_local_sem);
 
-        _net("LOCAL new %d {%d,%u,%u.%u.%u.%u+%hu}",
+        _net("LOCAL new %d {%d,%u,%pI4+%hu}",
              local->debug_id,
              local->srx.transport_type,
              local->srx.transport.family,
-             NIPQUAD(local->srx.transport.sin.sin_addr),
+             &local->srx.transport.sin.sin_addr,
              ntohs(local->srx.transport.sin.sin_port));
 
         _leave(" = %p [new]", local);
@@ -203,11 +203,11 @@ found_local:
         read_unlock_bh(&rxrpc_local_lock);
         up_write(&rxrpc_local_sem);
 
-        _net("LOCAL old %d {%d,%u,%u.%u.%u.%u+%hu}",
+        _net("LOCAL old %d {%d,%u,%pI4+%hu}",
              local->debug_id,
              local->srx.transport_type,
              local->srx.transport.family,
-             NIPQUAD(local->srx.transport.sin.sin_addr),
+             &local->srx.transport.sin.sin_addr,
              ntohs(local->srx.transport.sin.sin_port));
 
         _leave(" = %p [reuse]", local);
diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
index 2abe2081a5e8..edc026c1eb76 100644
--- a/net/rxrpc/ar-peer.c
+++ b/net/rxrpc/ar-peer.c
@@ -123,10 +123,10 @@ struct rxrpc_peer *rxrpc_get_peer(struct sockaddr_rxrpc *srx, gfp_t gfp)
         const char *new = "old";
         int usage;
 
-        _enter("{%d,%d,%u.%u.%u.%u+%hu}",
+        _enter("{%d,%d,%pI4+%hu}",
                srx->transport_type,
                srx->transport_len,
-               NIPQUAD(srx->transport.sin.sin_addr),
+               &srx->transport.sin.sin_addr,
                ntohs(srx->transport.sin.sin_port));
 
         /* search the peer list first */
@@ -177,12 +177,12 @@ struct rxrpc_peer *rxrpc_get_peer(struct sockaddr_rxrpc *srx, gfp_t gfp)
         new = "new";
 
 success:
-        _net("PEER %s %d {%d,%u,%u.%u.%u.%u+%hu}",
+        _net("PEER %s %d {%d,%u,%pI4+%hu}",
              new,
              peer->debug_id,
              peer->srx.transport_type,
              peer->srx.transport.family,
-             NIPQUAD(peer->srx.transport.sin.sin_addr),
+             &peer->srx.transport.sin.sin_addr,
              ntohs(peer->srx.transport.sin.sin_port));
 
         _leave(" = %p {u=%d}", peer, atomic_read(&peer->usage));
diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
index 017322e2786d..38047f713f2c 100644
--- a/net/rxrpc/ar-proc.c
+++ b/net/rxrpc/ar-proc.c
@@ -61,12 +61,12 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
         call = list_entry(v, struct rxrpc_call, link);
         trans = call->conn->trans;
 
-        sprintf(lbuff, NIPQUAD_FMT":%u",
-                NIPQUAD(trans->local->srx.transport.sin.sin_addr),
+        sprintf(lbuff, "%pI4:%u",
+                &trans->local->srx.transport.sin.sin_addr,
                 ntohs(trans->local->srx.transport.sin.sin_port));
 
-        sprintf(rbuff, NIPQUAD_FMT":%u",
-                NIPQUAD(trans->peer->srx.transport.sin.sin_addr),
+        sprintf(rbuff, "%pI4:%u",
+                &trans->peer->srx.transport.sin.sin_addr,
                 ntohs(trans->peer->srx.transport.sin.sin_port));
 
         seq_printf(seq,
@@ -144,12 +144,12 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
         conn = list_entry(v, struct rxrpc_connection, link);
         trans = conn->trans;
 
-        sprintf(lbuff, NIPQUAD_FMT":%u",
-                NIPQUAD(trans->local->srx.transport.sin.sin_addr),
+        sprintf(lbuff, "%pI4:%u",
+                &trans->local->srx.transport.sin.sin_addr,
                 ntohs(trans->local->srx.transport.sin.sin_port));
 
-        sprintf(rbuff, NIPQUAD_FMT":%u",
-                NIPQUAD(trans->peer->srx.transport.sin.sin_addr),
+        sprintf(rbuff, "%pI4:%u",
+                &trans->peer->srx.transport.sin.sin_addr,
                 ntohs(trans->peer->srx.transport.sin.sin_port));
 
         seq_printf(seq,
diff --git a/net/rxrpc/ar-security.c b/net/rxrpc/ar-security.c
index 60d1d364430a..dc62920ee19a 100644
--- a/net/rxrpc/ar-security.c
+++ b/net/rxrpc/ar-security.c
@@ -40,7 +40,7 @@ static void rxrpc_security_put(struct rxrpc_security *sec)
 /*
  * look up an rxrpc security module
  */
-struct rxrpc_security *rxrpc_security_lookup(u8 security_index)
+static struct rxrpc_security *rxrpc_security_lookup(u8 security_index)
 {
         struct rxrpc_security *sec = NULL;
 
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
index 64069c8769a5..0936e1acc30e 100644
--- a/net/rxrpc/ar-transport.c
+++ b/net/rxrpc/ar-transport.c
@@ -78,10 +78,10 @@ struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *local,
         const char *new = "old";
         int usage;
 
-        _enter("{%u.%u.%u.%u+%hu},{%u.%u.%u.%u+%hu},",
-               NIPQUAD(local->srx.transport.sin.sin_addr),
+        _enter("{%pI4+%hu},{%pI4+%hu},",
+               &local->srx.transport.sin.sin_addr,
                ntohs(local->srx.transport.sin.sin_port),
-               NIPQUAD(peer->srx.transport.sin.sin_addr),
+               &peer->srx.transport.sin.sin_addr,
                ntohs(peer->srx.transport.sin.sin_port));
 
         /* search the transport list first */
@@ -149,10 +149,10 @@ struct rxrpc_transport *rxrpc_find_transport(struct rxrpc_local *local,
 {
         struct rxrpc_transport *trans;
 
-        _enter("{%u.%u.%u.%u+%hu},{%u.%u.%u.%u+%hu},",
-               NIPQUAD(local->srx.transport.sin.sin_addr),
+        _enter("{%pI4+%hu},{%pI4+%hu},",
+               &local->srx.transport.sin.sin_addr,
                ntohs(local->srx.transport.sin.sin_port),
-               NIPQUAD(peer->srx.transport.sin.sin_addr),
+               &peer->srx.transport.sin.sin_addr,
                ntohs(peer->srx.transport.sin.sin_port));
 
         /* search the transport list */
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
index ba3f6e49fddc..ef8f91030a15 100644
--- a/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@ -897,7 +897,7 @@ static int rxkad_decrypt_ticket(struct rxrpc_connection *conn,
         /* get the IPv4 address of the entity that requested the ticket */
         memcpy(&addr, p, sizeof(addr));
         p += 4;
-        _debug("KIV ADDR : "NIPQUAD_FMT, NIPQUAD(addr));
+        _debug("KIV ADDR : %pI4", &addr);
 
         /* get the session key from the ticket */
         memcpy(&key, p, sizeof(key));