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, 6 insertions, 12 deletions

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;
 }