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, 16 insertions, 22 deletions

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index fb6c70cec253..acca6678cb2b 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -1295,7 +1295,7 @@ lcs_set_multicast_list(struct net_device *dev)
         struct lcs_card *card;
 
         LCS_DBF_TEXT(4, trace, "setmulti");
-        card = (struct lcs_card *) dev->priv;
+        card = (struct lcs_card *) dev->ml_priv;
 
         if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD))
                 schedule_work(&card->kernel_thread_starter);
@@ -1617,7 +1617,7 @@ lcs_start_xmit(struct sk_buff *skb, struct net_device *dev)
         int rc;
 
         LCS_DBF_TEXT(5, trace, "pktxmit");
-        card = (struct lcs_card *) dev->priv;
+        card = (struct lcs_card *) dev->ml_priv;
         rc = __lcs_start_xmit(card, skb, dev);
         return rc;
 }
@@ -1874,7 +1874,7 @@ lcs_getstats(struct net_device *dev)
         struct lcs_card *card;
 
         LCS_DBF_TEXT(4, trace, "netstats");
-        card = (struct lcs_card *) dev->priv;
+        card = (struct lcs_card *) dev->ml_priv;
         return &card->stats;
 }
 
@@ -1889,7 +1889,7 @@ lcs_stop_device(struct net_device *dev)
         int rc;
 
         LCS_DBF_TEXT(2, trace, "stopdev");
-        card   = (struct lcs_card *) dev->priv;
+        card   = (struct lcs_card *) dev->ml_priv;
         netif_carrier_off(dev);
         netif_tx_disable(dev);
         dev->flags &= ~IFF_UP;
@@ -1913,7 +1913,7 @@ lcs_open_device(struct net_device *dev)
         int rc;
 
         LCS_DBF_TEXT(2, trace, "opendev");
-        card = (struct lcs_card *) dev->priv;
+        card = (struct lcs_card *) dev->ml_priv;
         /* initialize statistics */
         rc = lcs_detect(card);
         if (rc) {
@@ -2163,7 +2163,7 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
         if (!dev)
                 goto out;
         card->dev = dev;
-        card->dev->priv = card;
+        card->dev->ml_priv = card;
         card->dev->open = lcs_open_device;
         card->dev->stop = lcs_stop_device;
         card->dev->hard_start_xmit = lcs_start_xmit;
diff --git a/drivers/s390/net/qeth_core_offl.c b/drivers/s390/net/qeth_core_offl.c
index 452874e89740..4080126ca48c 100644
--- a/drivers/s390/net/qeth_core_offl.c
+++ b/drivers/s390/net/qeth_core_offl.c
@@ -350,7 +350,7 @@ static __wsum qeth_eddp_check_tcp4_hdr(struct qeth_eddp_data *eddp,
         phcsum = csum_tcpudp_nofold(eddp->nh.ip4.h.saddr, eddp->nh.ip4.h.daddr,
                                     eddp->thl + data_len, IPPROTO_TCP, 0);
         /* compute checksum of tcp header */
-        return csum_partial((u8 *)&eddp->th, eddp->thl, phcsum);
+        return csum_partial(&eddp->th, eddp->thl, phcsum);
 }
 
 static __wsum qeth_eddp_check_tcp6_hdr(struct qeth_eddp_data *eddp,
@@ -362,12 +362,12 @@ static __wsum qeth_eddp_check_tcp6_hdr(struct qeth_eddp_data *eddp,
         QETH_DBF_TEXT(TRACE, 5, "eddpckt6");
         eddp->th.tcp.h.check = 0;
         /* compute pseudo header checksum */
-        phcsum = csum_partial((u8 *)&eddp->nh.ip6.h.saddr,
+        phcsum = csum_partial(&eddp->nh.ip6.h.saddr,
                               sizeof(struct in6_addr), 0);
-        phcsum = csum_partial((u8 *)&eddp->nh.ip6.h.daddr,
+        phcsum = csum_partial(&eddp->nh.ip6.h.daddr,
                               sizeof(struct in6_addr), phcsum);
         proto = htonl(IPPROTO_TCP);
-        phcsum = csum_partial((u8 *)&proto, sizeof(u32), phcsum);
+        phcsum = csum_partial(&proto, sizeof(u32), phcsum);
         return phcsum;
 }
 
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index af15bc648ba1..2c48591ced44 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -134,17 +134,13 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
         mac = &cmd->data.setdelmac.mac[0];
         /* MAC already registered, needed in couple/uncouple case */
         if (cmd->hdr.return_code == 0x2005) {
-                QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x "
-                          "already existing on %s \n",
-                          mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                          QETH_CARD_IFNAME(card));
+                QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",
+                          mac, QETH_CARD_IFNAME(card));
                 cmd->hdr.return_code = 0;
         }
         if (cmd->hdr.return_code)
-                QETH_DBF_MESSAGE(2, "Could not set group MAC "
-                          "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
-                          mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                          QETH_CARD_IFNAME(card), cmd->hdr.return_code);
+                QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %x\n",
+                          mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
         return 0;
 }
 
@@ -166,10 +162,8 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card,
         cmd = (struct qeth_ipa_cmd *) data;
         mac = &cmd->data.setdelmac.mac[0];
         if (cmd->hdr.return_code)
-                QETH_DBF_MESSAGE(2, "Could not delete group MAC "
-                          "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
-                          mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                          QETH_CARD_IFNAME(card), cmd->hdr.return_code);
+                QETH_DBF_MESSAGE(2, "Could not delete group MAC %pM on %s: %x\n",
+                          mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
         return 0;
 }