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

diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index f9b37c80dda6..a539bc3163cf 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -308,7 +308,18 @@ static int epic_close(struct net_device *dev);
 static struct net_device_stats *epic_get_stats(struct net_device *dev);
 static void set_rx_mode(struct net_device *dev);
 
-
+static const struct net_device_ops epic_netdev_ops = {
+        .ndo_open               = epic_open,
+        .ndo_stop               = epic_close,
+        .ndo_start_xmit         = epic_start_xmit,
+        .ndo_tx_timeout         = epic_tx_timeout,
+        .ndo_get_stats          = epic_get_stats,
+        .ndo_set_multicast_list = set_rx_mode,
+        .ndo_do_ioctl           = netdev_ioctl,
+        .ndo_change_mtu         = eth_change_mtu,
+        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_validate_addr      = eth_validate_addr,
+};
 
 static int __devinit epic_init_one (struct pci_dev *pdev,
                                     const struct pci_device_id *ent)
@@ -483,15 +494,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
         dev->if_port = ep->default_port = option;
 
         /* The Epic-specific entries in the device structure. */
-        dev->open = &epic_open;
-        dev->hard_start_xmit = &epic_start_xmit;
-        dev->stop = &epic_close;
-        dev->get_stats = &epic_get_stats;
-        dev->set_multicast_list = &set_rx_mode;
-        dev->do_ioctl = &netdev_ioctl;
+        dev->netdev_ops = &epic_netdev_ops;
         dev->ethtool_ops = &netdev_ethtool_ops;
         dev->watchdog_timeo = TX_TIMEOUT;
-        dev->tx_timeout = &epic_tx_timeout;
         netif_napi_add(dev, &ep->napi, epic_poll, 64);
 
         ret = register_netdev(dev);