diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 23:53:32 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 23:53:32 +0200 |
commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /drivers/net/sunbmac.c | |
parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
download | op-kernel-dev-65fb0d23fcddd8697c871047b700c78817bdaa43.zip op-kernel-dev-65fb0d23fcddd8697c871047b700c78817bdaa43.tar.gz |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'drivers/net/sunbmac.c')
-rw-r--r-- | drivers/net/sunbmac.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 7f69c7f..5017d7f 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c @@ -1074,6 +1074,18 @@ static const struct ethtool_ops bigmac_ethtool_ops = { .get_link = bigmac_get_link, }; +static const struct net_device_ops bigmac_ops = { + .ndo_open = bigmac_open, + .ndo_stop = bigmac_close, + .ndo_start_xmit = bigmac_start_xmit, + .ndo_get_stats = bigmac_get_stats, + .ndo_set_multicast_list = bigmac_set_multicast, + .ndo_tx_timeout = bigmac_tx_timeout, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + static int __devinit bigmac_ether_init(struct of_device *op, struct of_device *qec_op) { @@ -1187,16 +1199,8 @@ static int __devinit bigmac_ether_init(struct of_device *op, bp->dev = dev; /* Set links to our BigMAC open and close routines. */ - dev->open = &bigmac_open; - dev->stop = &bigmac_close; - dev->hard_start_xmit = &bigmac_start_xmit; dev->ethtool_ops = &bigmac_ethtool_ops; - - /* Set links to BigMAC statistic and multi-cast loading code. */ - dev->get_stats = &bigmac_get_stats; - dev->set_multicast_list = &bigmac_set_multicast; - - dev->tx_timeout = &bigmac_tx_timeout; + dev->netdev_ops = &bigmac_ops; dev->watchdog_timeo = 5*HZ; /* Finish net device registration. */ |