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).

3 files changed, 19 insertions, 20 deletions

diff --git a/fs/ocfs2/cluster/netdebug.c b/fs/ocfs2/cluster/netdebug.c
index 52276c02f710..f8424874fa07 100644
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
@@ -304,8 +304,8 @@ static int sc_seq_show(struct seq_file *seq, void *v)
                  * use of it here generates a warning with -Wbitwise */
                 seq_printf(seq, "%p:\n"
                            "  krefs:           %d\n"
-                           "  sock:            %u.%u.%u.%u:%u -> "
-                                              "%u.%u.%u.%u:%u\n"
+                           "  sock:            %pI4:%u -> "
+                                              "%pI4:%u\n"
                            "  remote node:     %s\n"
                            "  page off:        %zu\n"
                            "  handshake ok:    %u\n"
@@ -319,8 +319,8 @@ static int sc_seq_show(struct seq_file *seq, void *v)
                            "  func type:       %u\n",
                            sc,
                            atomic_read(&sc->sc_kref.refcount),
-                           NIPQUAD(saddr), inet ? ntohs(sport) : 0,
-                           NIPQUAD(daddr), inet ? ntohs(dport) : 0,
+                           &saddr, inet ? ntohs(sport) : 0,
+                           &daddr, inet ? ntohs(dport) : 0,
                            sc->sc_node->nd_name,
                            sc->sc_page_off,
                            sc->sc_handshake_ok,
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index 816a3f61330c..70e8fa9e2539 100644
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -250,7 +250,7 @@ static ssize_t o2nm_node_ipv4_port_write(struct o2nm_node *node,
 
 static ssize_t o2nm_node_ipv4_address_read(struct o2nm_node *node, char *page)
 {
-        return sprintf(page, "%u.%u.%u.%u\n", NIPQUAD(node->nd_ipv4_address));
+        return sprintf(page, "%pI4\n", &node->nd_ipv4_address);
 }
 
 static ssize_t o2nm_node_ipv4_address_write(struct o2nm_node *node,
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 2bcf706d9dd3..9fbe849f6344 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -1597,8 +1597,8 @@ static void o2net_start_connect(struct work_struct *work)
         ret = sock->ops->bind(sock, (struct sockaddr *)&myaddr,
                               sizeof(myaddr));
         if (ret) {
-                mlog(ML_ERROR, "bind failed with %d at address %u.%u.%u.%u\n",
-                     ret, NIPQUAD(mynode->nd_ipv4_address));
+                mlog(ML_ERROR, "bind failed with %d at address %pI4\n",
+                     ret, &mynode->nd_ipv4_address);
                 goto out;
         }
 
@@ -1790,17 +1790,16 @@ static int o2net_accept_one(struct socket *sock)
 
         node = o2nm_get_node_by_ip(sin.sin_addr.s_addr);
         if (node == NULL) {
-                mlog(ML_NOTICE, "attempt to connect from unknown node at "
-                     "%u.%u.%u.%u:%d\n", NIPQUAD(sin.sin_addr.s_addr),
-                     ntohs(sin.sin_port));
+                mlog(ML_NOTICE, "attempt to connect from unknown node at %pI4:%d\n",
+                     &sin.sin_addr.s_addr, ntohs(sin.sin_port));
                 ret = -EINVAL;
                 goto out;
         }
 
         if (o2nm_this_node() > node->nd_num) {
                 mlog(ML_NOTICE, "unexpected connect attempted from a lower "
-                     "numbered node '%s' at " "%u.%u.%u.%u:%d with num %u\n",
-                     node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
+                     "numbered node '%s' at " "%pI4:%d with num %u\n",
+                     node->nd_name, &sin.sin_addr.s_addr,
                      ntohs(sin.sin_port), node->nd_num);
                 ret = -EINVAL;
                 goto out;
@@ -1810,8 +1809,8 @@ static int o2net_accept_one(struct socket *sock)
          * and tries to connect before we see their heartbeat */
         if (!o2hb_check_node_heartbeating_from_callback(node->nd_num)) {
                 mlog(ML_CONN, "attempt to connect from node '%s' at "
-                     "%u.%u.%u.%u:%d but it isn't heartbeating\n",
-                     node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
+                     "%pI4:%d but it isn't heartbeating\n",
+                     node->nd_name, &sin.sin_addr.s_addr,
                      ntohs(sin.sin_port));
                 ret = -EINVAL;
                 goto out;
@@ -1827,8 +1826,8 @@ static int o2net_accept_one(struct socket *sock)
         spin_unlock(&nn->nn_lock);
         if (ret) {
                 mlog(ML_NOTICE, "attempt to connect from node '%s' at "
-                     "%u.%u.%u.%u:%d but it already has an open connection\n",
-                     node->nd_name, NIPQUAD(sin.sin_addr.s_addr),
+                     "%pI4:%d but it already has an open connection\n",
+                     node->nd_name, &sin.sin_addr.s_addr,
                      ntohs(sin.sin_port));
                 goto out;
         }
@@ -1924,15 +1923,15 @@ static int o2net_open_listening_sock(__be32 addr, __be16 port)
         sock->sk->sk_reuse = 1;
         ret = sock->ops->bind(sock, (struct sockaddr *)&sin, sizeof(sin));
         if (ret < 0) {
-                mlog(ML_ERROR, "unable to bind socket at %u.%u.%u.%u:%u, "
-                     "ret=%d\n", NIPQUAD(addr), ntohs(port), ret);
+                mlog(ML_ERROR, "unable to bind socket at %pI4:%u, "
+                     "ret=%d\n", &addr, ntohs(port), ret);
                 goto out;
         }
 
         ret = sock->ops->listen(sock, 64);
         if (ret < 0) {
-                mlog(ML_ERROR, "unable to listen on %u.%u.%u.%u:%u, ret=%d\n",
-                     NIPQUAD(addr), ntohs(port), ret);
+                mlog(ML_ERROR, "unable to listen on %pI4:%u, ret=%d\n",
+                     &addr, ntohs(port), ret);
         }
 
 out: