From 8c26de53f00a8e0c7ff1ee8a08fd6dd479f9aaea Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 6 Jan 2009 10:44:55 -0800 Subject: [PATCH] --- yaml --- r: 127767 b: refs/heads/master c: 0a0b9d2edc3d7b56386dd980f7d17eaaad15cf6a h: refs/heads/master i: 127765: 27b5c670c164cc3c123208cbc2a29727f14bfd88 127763: 9bd9770022b16977f369e4a714ac9920dba0b2e8 127759: 774b3030c0b0a2e5c222b40204ef8d44c313b138 v: v3 --- [refs] | 2 +- trunk/drivers/net/xen-netfront.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 84ab9aa16450..7e6cda42bc67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76288b4e573e06318fda65678052cfbde98fed1d +refs/heads/master: 0a0b9d2edc3d7b56386dd980f7d17eaaad15cf6a diff --git a/trunk/drivers/net/xen-netfront.c b/trunk/drivers/net/xen-netfront.c index 761635be9104..cd6184ee08ee 100644 --- a/trunk/drivers/net/xen-netfront.c +++ b/trunk/drivers/net/xen-netfront.c @@ -1105,6 +1105,16 @@ static void xennet_uninit(struct net_device *dev) gnttab_free_grant_references(np->gref_rx_head); } +static const struct net_device_ops xennet_netdev_ops = { + .ndo_open = xennet_open, + .ndo_uninit = xennet_uninit, + .ndo_stop = xennet_close, + .ndo_start_xmit = xennet_start_xmit, + .ndo_change_mtu = xennet_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev) { int i, err; @@ -1161,12 +1171,9 @@ static struct net_device * __devinit xennet_create_dev(struct xenbus_device *dev goto exit_free_tx; } - netdev->open = xennet_open; - netdev->hard_start_xmit = xennet_start_xmit; - netdev->stop = xennet_close; + netdev->netdev_ops = &xennet_netdev_ops; + netif_napi_add(netdev, &np->napi, xennet_poll, 64); - netdev->uninit = xennet_uninit; - netdev->change_mtu = xennet_change_mtu; netdev->features = NETIF_F_IP_CSUM; SET_ETHTOOL_OPS(netdev, &xennet_ethtool_ops);