[PATCH 04/77] infiniband: convert nes driver to net_device_ops

Previous thread: [PATCH 00/77] Convert most of the rest of the devices to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (1 message)

Next thread: [PATCH 03/77] infiniband: convert c2 to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (5 messages)
From: Stephen Hemminger
Date: Friday, March 20, 2009 - 10:35 pm

Also, removed unnecessary memset() sinc alloc_netdev returns
zeroed memory.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

---
 drivers/infiniband/hw/nes/nes_nic.c |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

--- a/drivers/infiniband/hw/nes/nes_nic.c	2009-03-19 22:40:30.556964185 -0700
+++ b/drivers/infiniband/hw/nes/nes_nic.c	2009-03-19 22:42:43.317902045 -0700
@@ -1568,6 +1568,19 @@ static void nes_netdev_vlan_rx_register(
 	spin_unlock_irqrestore(&nesadapter->phy_lock, flags);
 }
 
+static const struct net_device_ops nes_netdev_ops = {
+	.ndo_open 		= nes_netdev_open,
+	.ndo_stop		= nes_netdev_stop,
+	.ndo_start_xmit 	= nes_netdev_start_xmit,
+	.ndo_get_stats		= nes_netdev_get_stats,
+	.ndo_tx_timeout 	= nes_netdev_tx_timeout,
+	.ndo_set_mac_address	= nes_netdev_set_mac_address,
+	.ndo_set_multicast_list = nes_netdev_set_multicast_list,
+	.ndo_change_mtu		= nes_netdev_change_mtu,
+	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+	.ndo_vlan_rx_register 	= nes_netdev_vlan_rx_register,
+};
 
 /**
  * nes_netdev_init - initialize network device
@@ -1593,17 +1606,6 @@ struct net_device *nes_netdev_init(struc
 
 	SET_NETDEV_DEV(netdev, &nesdev->pcidev->dev);
 
-	nesvnic = netdev_priv(netdev);
-	memset(nesvnic, 0, sizeof(*nesvnic));
-
-	netdev->open = nes_netdev_open;
-	netdev->stop = nes_netdev_stop;
-	netdev->hard_start_xmit = nes_netdev_start_xmit;
-	netdev->get_stats = nes_netdev_get_stats;
-	netdev->tx_timeout = nes_netdev_tx_timeout;
-	netdev->set_mac_address = nes_netdev_set_mac_address;
-	netdev->set_multicast_list = nes_netdev_set_multicast_list;
-	netdev->change_mtu = nes_netdev_change_mtu;
 	netdev->watchdog_timeo = NES_TX_TIMEOUT;
 	netdev->irq = nesdev->pcidev->irq;
 	netdev->mtu = ETH_DATA_LEN;
@@ -1611,14 +1613,15 @@ struct net_device *nes_netdev_init(struc
 	netdev->addr_len = ETH_ALEN;
 	netdev->type = ARPHRD_ETHER;
 	netdev->features = ...
From: David Miller
Date: Saturday, March 21, 2009 - 7:34 pm

From: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--

Previous thread: [PATCH 00/77] Convert most of the rest of the devices to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (1 message)

Next thread: [PATCH 03/77] infiniband: convert c2 to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:35 pm. (5 messages)