lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PS3: gelic: convert the ethernet part to net_device_ops

Browse Source 
Convert the gelic driver to net_device_ops

Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Masakazu Mokuno
2009-01-15 22:47:29 +00:00
committed by David S. Miller
parent 3d16543d32
commit 5384e8361a
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/ps3_gelic_net.c
View File

@@ -1403,6 +1403,19 @@ void gelic_net_tx_timeout(struct net_device *netdev)
atomic_dec(&card->tx_timeout_task_counter); atomic_dec(&card->tx_timeout_task_counter);
} }
static const struct net_device_ops gelic_netdevice_ops = {
.ndo_open = gelic_net_open,
.ndo_stop = gelic_net_stop,
.ndo_start_xmit = gelic_net_xmit,
.ndo_set_multicast_list = gelic_net_set_multi,
.ndo_change_mtu = gelic_net_change_mtu,
.ndo_tx_timeout = gelic_net_tx_timeout,
.ndo_validate_addr = eth_validate_addr,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = gelic_net_poll_controller,
#endif
};
/** /**
* gelic_ether_setup_netdev_ops - initialization of net_device operations * gelic_ether_setup_netdev_ops - initialization of net_device operations
* @netdev: net_device structure * @netdev: net_device structure
@@ -1412,21 +1425,12 @@ void gelic_net_tx_timeout(struct net_device *netdev)
static void gelic_ether_setup_netdev_ops(struct net_device *netdev, static void gelic_ether_setup_netdev_ops(struct net_device *netdev,
struct napi_struct *napi) struct napi_struct *napi)
{ {
netdev->open = &gelic_net_open;
netdev->stop = &gelic_net_stop;
netdev->hard_start_xmit = &gelic_net_xmit;
netdev->set_multicast_list = &gelic_net_set_multi;
netdev->change_mtu = &gelic_net_change_mtu;
/* tx watchdog */
netdev->tx_timeout = &gelic_net_tx_timeout;
netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT; netdev->watchdog_timeo = GELIC_NET_WATCHDOG_TIMEOUT;
/* NAPI */ /* NAPI */
netif_napi_add(netdev, napi, netif_napi_add(netdev, napi,
gelic_net_poll, GELIC_NET_NAPI_WEIGHT); gelic_net_poll, GELIC_NET_NAPI_WEIGHT);
netdev->ethtool_ops = &gelic_ether_ethtool_ops; netdev->ethtool_ops = &gelic_ether_ethtool_ops;
#ifdef CONFIG_NET_POLL_CONTROLLER netdev->netdev_ops = &gelic_netdevice_ops;
netdev->poll_controller = gelic_net_poll_controller;
#endif
} }
/** /**