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

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 6c023f0f8252..18538d7460d7 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -147,7 +147,7 @@ static int br_set_tx_csum(struct net_device *dev, u32 data)
         return 0;
 }
 
-static struct ethtool_ops br_ethtool_ops = {
+static const struct ethtool_ops br_ethtool_ops = {
         .get_drvinfo    = br_getinfo,
         .get_link       = ethtool_op_get_link,
         .get_tx_csum    = ethtool_op_get_tx_csum,
@@ -160,21 +160,25 @@ static struct ethtool_ops br_ethtool_ops = {
         .get_flags      = ethtool_op_get_flags,
 };
 
+static const struct net_device_ops br_netdev_ops = {
+        .ndo_open                = br_dev_open,
+        .ndo_stop                = br_dev_stop,
+        .ndo_start_xmit          = br_dev_xmit,
+        .ndo_set_mac_address     = br_set_mac_address,
+        .ndo_set_multicast_list  = br_dev_set_multicast_list,
+        .ndo_change_mtu          = br_change_mtu,
+        .ndo_do_ioctl            = br_dev_ioctl,
+};
+
 void br_dev_setup(struct net_device *dev)
 {
         random_ether_addr(dev->dev_addr);
         ether_setup(dev);
 
-        dev->do_ioctl = br_dev_ioctl;
-        dev->hard_start_xmit = br_dev_xmit;
-        dev->open = br_dev_open;
-        dev->set_multicast_list = br_dev_set_multicast_list;
-        dev->change_mtu = br_change_mtu;
+        dev->netdev_ops = &br_netdev_ops;
         dev->destructor = free_netdev;
         SET_ETHTOOL_OPS(dev, &br_ethtool_ops);
-        dev->stop = br_dev_stop;
         dev->tx_queue_len = 0;
-        dev->set_mac_address = br_set_mac_address;
         dev->priv_flags = IFF_EBRIDGE;
 
         dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |