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

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 5166be930a52..d5d53b633cf8 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1922,6 +1922,18 @@ bad_srom:
         goto fill_defaults;
 }
 
+static const struct net_device_ops de_netdev_ops = {
+        .ndo_open               = de_open,
+        .ndo_stop               = de_close,
+        .ndo_set_multicast_list = de_set_rx_mode,
+        .ndo_start_xmit         = de_start_xmit,
+        .ndo_get_stats          = de_get_stats,
+        .ndo_tx_timeout         = de_tx_timeout,
+        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_validate_addr      = eth_validate_addr,
+};
+
 static int __devinit de_init_one (struct pci_dev *pdev,
                                   const struct pci_device_id *ent)
 {
@@ -1944,14 +1956,9 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         if (!dev)
                 return -ENOMEM;
 
+        dev->netdev_ops = &de_netdev_ops;
         SET_NETDEV_DEV(dev, &pdev->dev);
-        dev->open = de_open;
-        dev->stop = de_close;
-        dev->set_multicast_list = de_set_rx_mode;
-        dev->hard_start_xmit = de_start_xmit;
-        dev->get_stats = de_get_stats;
         dev->ethtool_ops = &de_ethtool_ops;
-        dev->tx_timeout = de_tx_timeout;
         dev->watchdog_timeo = TX_TIMEOUT;
 
         de = netdev_priv(dev);