Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (84 commits)
  wimax: fix kernel-doc for debufs_dentry member of struct wimax_dev
  net: convert pegasus driver to net_device_ops
  bnx2x: Prevent eeprom set when driver is down
  net: switch kaweth driver to netdevops
  pcnet32: round off carrier watch timer
  i2400m/usb: wrap USB power saving in #ifdef CONFIG_PM
  wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULE
  wimax: fix kconfig interactions with rfkill and input layers
  wimax: fix '#ifndef CONFIG_BUG' layout to avoid warning
  r6040: bump release number to 0.20
  r6040: warn about MAC address being unset
  r6040: check PHY status when bringing interface up
  r6040: make printks consistent with DRV_NAME
  gianfar: Fixup use of BUS_ID_SIZE
  mlx4_en: Returning real Max in get_ringparam
  mlx4_en: Consider inline packets on completion
  netdev: bfin_mac: enable bfin_mac net dev driver for BF51x
  qeth: convert to net_device_ops
  vlan: add neigh_setup
  dm9601: warn on invalid mac address
  ...

1 files changed, 14 insertions, 8 deletions

diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 8a7460412482..86c765d83de1 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2989,6 +2989,19 @@ static void gem_remove_one(struct pci_dev *pdev)
         }
 }
 
+static const struct net_device_ops gem_netdev_ops = {
+        .ndo_open               = gem_open,
+        .ndo_stop               = gem_close,
+        .ndo_start_xmit         = gem_start_xmit,
+        .ndo_get_stats          = gem_get_stats,
+        .ndo_set_multicast_list = gem_set_multicast,
+        .ndo_do_ioctl           = gem_ioctl,
+        .ndo_tx_timeout         = gem_tx_timeout,
+        .ndo_change_mtu         = gem_change_mtu,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_validate_addr      = eth_validate_addr,
+};
+
 static int __devinit gem_init_one(struct pci_dev *pdev,
                                   const struct pci_device_id *ent)
 {
@@ -3142,17 +3155,10 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
         if (gem_get_device_address(gp))
                 goto err_out_free_consistent;
 
-        dev->open = gem_open;
-        dev->stop = gem_close;
-        dev->hard_start_xmit = gem_start_xmit;
-        dev->get_stats = gem_get_stats;
-        dev->set_multicast_list = gem_set_multicast;
-        dev->do_ioctl = gem_ioctl;
+        dev->netdev_ops = &gem_netdev_ops;
         netif_napi_add(dev, &gp->napi, gem_poll, 64);
         dev->ethtool_ops = &gem_ethtool_ops;
-        dev->tx_timeout = gem_tx_timeout;
         dev->watchdog_timeo = 5 * HZ;
-        dev->change_mtu = gem_change_mtu;
         dev->irq = pdev->irq;
         dev->dma = 0;
         dev->set_mac_address = gem_set_mac_address;