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

1 files changed, 15 insertions, 13 deletions

diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 4074a6e5d0de..5d8a2a56fd39 100644
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -83,7 +83,9 @@ static void dn_log_martian(struct sk_buff *skb, const char *msg)
         if (decnet_log_martians && net_ratelimit()) {
                 char *devname = skb->dev ? skb->dev->name : "???";
                 struct dn_skb_cb *cb = DN_SKB_CB(skb);
-                printk(KERN_INFO "DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n", msg, devname, dn_ntohs(cb->src), dn_ntohs(cb->dst), dn_ntohs(cb->src_port), dn_ntohs(cb->dst_port));
+                printk(KERN_INFO "DECnet: Martian packet (%s) dev=%s src=0x%04hx dst=0x%04hx srcport=0x%04hx dstport=0x%04hx\n",
+                       msg, devname, le16_to_cpu(cb->src), le16_to_cpu(cb->dst),
+                       le16_to_cpu(cb->src_port), le16_to_cpu(cb->dst_port));
         }
 }
 
@@ -133,7 +135,7 @@ static int dn_process_ack(struct sock *sk, struct sk_buff *skb, int oth)
         if (skb->len < 2)
                 return len;
 
-        if ((ack = dn_ntohs(*ptr)) & 0x8000) {
+        if ((ack = le16_to_cpu(*ptr)) & 0x8000) {
                 skb_pull(skb, 2);
                 ptr++;
                 len += 2;
@@ -147,7 +149,7 @@ static int dn_process_ack(struct sock *sk, struct sk_buff *skb, int oth)
         if (skb->len < 2)
                 return len;
 
-        if ((ack = dn_ntohs(*ptr)) & 0x8000) {
+        if ((ack = le16_to_cpu(*ptr)) & 0x8000) {
                 skb_pull(skb, 2);
                 len += 2;
                 if ((ack & 0x4000) == 0) {
@@ -237,7 +239,7 @@ static struct sock *dn_find_listener(struct sk_buff *skb, unsigned short *reason
         cb->dst_port = msg->dstaddr;
         cb->services = msg->services;
         cb->info     = msg->info;
-        cb->segsize  = dn_ntohs(msg->segsize);
+        cb->segsize  = le16_to_cpu(msg->segsize);
 
         if (!pskb_may_pull(skb, sizeof(*msg)))
                 goto err_out;
@@ -344,7 +346,7 @@ static void dn_nsp_conn_conf(struct sock *sk, struct sk_buff *skb)
         ptr = skb->data;
         cb->services = *ptr++;
         cb->info = *ptr++;
-        cb->segsize = dn_ntohs(*(__le16 *)ptr);
+        cb->segsize = le16_to_cpu(*(__le16 *)ptr);
 
         if ((scp->state == DN_CI) || (scp->state == DN_CD)) {
                 scp->persist = 0;
@@ -361,7 +363,7 @@ static void dn_nsp_conn_conf(struct sock *sk, struct sk_buff *skb)
                 if (skb->len > 0) {
                         u16 dlen = *skb->data;
                         if ((dlen <= 16) && (dlen <= skb->len)) {
-                                scp->conndata_in.opt_optl = dn_htons(dlen);
+                                scp->conndata_in.opt_optl = cpu_to_le16(dlen);
                                 skb_copy_from_linear_data_offset(skb, 1,
                                               scp->conndata_in.opt_data, dlen);
                         }
@@ -396,17 +398,17 @@ static void dn_nsp_disc_init(struct sock *sk, struct sk_buff *skb)
         if (skb->len < 2)
                 goto out;
 
-        reason = dn_ntohs(*(__le16 *)skb->data);
+        reason = le16_to_cpu(*(__le16 *)skb->data);
         skb_pull(skb, 2);
 
-        scp->discdata_in.opt_status = dn_htons(reason);
+        scp->discdata_in.opt_status = cpu_to_le16(reason);
         scp->discdata_in.opt_optl   = 0;
         memset(scp->discdata_in.opt_data, 0, 16);
 
         if (skb->len > 0) {
                 u16 dlen = *skb->data;
                 if ((dlen <= 16) && (dlen <= skb->len)) {
-                        scp->discdata_in.opt_optl = dn_htons(dlen);
+                        scp->discdata_in.opt_optl = cpu_to_le16(dlen);
                         skb_copy_from_linear_data_offset(skb, 1, scp->discdata_in.opt_data, dlen);
                 }
         }
@@ -463,7 +465,7 @@ static void dn_nsp_disc_conf(struct sock *sk, struct sk_buff *skb)
         if (skb->len != 2)
                 goto out;
 
-        reason = dn_ntohs(*(__le16 *)skb->data);
+        reason = le16_to_cpu(*(__le16 *)skb->data);
 
         sk->sk_state = TCP_CLOSE;
 
@@ -512,7 +514,7 @@ static void dn_nsp_linkservice(struct sock *sk, struct sk_buff *skb)
         if (skb->len != 4)
                 goto out;
 
-        segnum = dn_ntohs(*(__le16 *)ptr);
+        segnum = le16_to_cpu(*(__le16 *)ptr);
         ptr += 2;
         lsflags = *(unsigned char *)ptr++;
         fcval = *ptr;
@@ -620,7 +622,7 @@ static void dn_nsp_otherdata(struct sock *sk, struct sk_buff *skb)
         if (skb->len < 2)
                 goto out;
 
-        cb->segnum = segnum = dn_ntohs(*(__le16 *)skb->data);
+        cb->segnum = segnum = le16_to_cpu(*(__le16 *)skb->data);
         skb_pull(skb, 2);
 
         if (seq_next(scp->numoth_rcv, segnum)) {
@@ -648,7 +650,7 @@ static void dn_nsp_data(struct sock *sk, struct sk_buff *skb)
         if (skb->len < 2)
                 goto out;
 
-        cb->segnum = segnum = dn_ntohs(*(__le16 *)skb->data);
+        cb->segnum = segnum = le16_to_cpu(*(__le16 *)skb->data);
         skb_pull(skb, 2);
 
         if (seq_next(scp->numdat_rcv, segnum)) {