diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-23 16:33:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-23 16:33:21 -0400 |
commit | 2199b87a94375befd574a58b7824551c1e285833 (patch) | |
tree | 03775a33eedcdd650dec36a88d02e9104eb95c87 /drivers | |
parent | adaa0db1da2d885f49dd2dcc357cdbe68e6dc283 (diff) |
sunbmac: Convert to net_device_ops.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sunbmac.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index 7f69c7f176c4..70d96b7d71a0 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
@@ -1074,6 +1074,15 @@ static const struct ethtool_ops bigmac_ethtool_ops = { | |||
1074 | .get_link = bigmac_get_link, | 1074 | .get_link = bigmac_get_link, |
1075 | }; | 1075 | }; |
1076 | 1076 | ||
1077 | static const struct net_device_ops bigmac_ops = { | ||
1078 | .ndo_open = bigmac_open, | ||
1079 | .ndo_stop = bigmac_close, | ||
1080 | .ndo_start_xmit = bigmac_start_xmit, | ||
1081 | .ndo_get_stats = bigmac_get_stats, | ||
1082 | .ndo_set_multicast_list = bigmac_set_multicast, | ||
1083 | .ndo_tx_timeout = bigmac_tx_timeout, | ||
1084 | }; | ||
1085 | |||
1077 | static int __devinit bigmac_ether_init(struct of_device *op, | 1086 | static int __devinit bigmac_ether_init(struct of_device *op, |
1078 | struct of_device *qec_op) | 1087 | struct of_device *qec_op) |
1079 | { | 1088 | { |
@@ -1187,16 +1196,8 @@ static int __devinit bigmac_ether_init(struct of_device *op, | |||
1187 | bp->dev = dev; | 1196 | bp->dev = dev; |
1188 | 1197 | ||
1189 | /* Set links to our BigMAC open and close routines. */ | 1198 | /* Set links to our BigMAC open and close routines. */ |
1190 | dev->open = &bigmac_open; | ||
1191 | dev->stop = &bigmac_close; | ||
1192 | dev->hard_start_xmit = &bigmac_start_xmit; | ||
1193 | dev->ethtool_ops = &bigmac_ethtool_ops; | 1199 | dev->ethtool_ops = &bigmac_ethtool_ops; |
1194 | 1200 | dev->netdev_ops = &bigmac_ops; | |
1195 | /* Set links to BigMAC statistic and multi-cast loading code. */ | ||
1196 | dev->get_stats = &bigmac_get_stats; | ||
1197 | dev->set_multicast_list = &bigmac_set_multicast; | ||
1198 | |||
1199 | dev->tx_timeout = &bigmac_tx_timeout; | ||
1200 | dev->watchdog_timeo = 5*HZ; | 1201 | dev->watchdog_timeo = 5*HZ; |
1201 | 1202 | ||
1202 | /* Finish net device registration. */ | 1203 | /* Finish net device registration. */ |