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, 18 insertions, 9 deletions

diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index c01e290d09d2..b507dbc16e62 100644
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -158,6 +158,21 @@ out:
 }
 #endif
 
+static const struct net_device_ops hpp_netdev_ops = {
+        .ndo_open               = hpp_open,
+        .ndo_stop               = hpp_close,
+        .ndo_start_xmit         = eip_start_xmit,
+        .ndo_tx_timeout         = eip_tx_timeout,
+        .ndo_get_stats          = eip_get_stats,
+        .ndo_set_multicast_list = eip_set_multicast_list,
+        .ndo_validate_addr      = eth_validate_addr,
+        .ndo_change_mtu         = eth_change_mtu,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller    = eip_poll,
+#endif
+};
+
+
 /* Do the interesting part of the probe at a single address. */
 static int __init hpp_probe1(struct net_device *dev, int ioaddr)
 {
@@ -166,7 +181,6 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
         const char name[] = "HP-PC-LAN+";
         int mem_start;
         static unsigned version_printed;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -193,7 +207,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
         }
         checksum += inb(ioaddr + 14);
 
-        printk("%s", print_mac(mac, dev->dev_addr));
+        printk("%pM", dev->dev_addr);
 
         if (checksum != 0xff) {
                 printk(" bad checksum %2.2x.\n", checksum);
@@ -227,11 +241,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
         /* Set the base address to point to the NIC, not the "real" base! */
         dev->base_addr = ioaddr + NIC_OFFSET;
 
-        dev->open = &hpp_open;
-        dev->stop = &hpp_close;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        dev->poll_controller = eip_poll;
-#endif
+        dev->netdev_ops = &hpp_netdev_ops;
 
         ei_status.name = name;
         ei_status.word16 = 0;           /* Agggghhhhh! Debug time: 2 days! */
@@ -302,8 +312,7 @@ hpp_open(struct net_device *dev)
         /* Select the operational page. */
         outw(Perf_Page, ioaddr + HP_PAGING);
 
-        eip_open(dev);
-        return 0;
+        return eip_open(dev);
 }
 
 static int