diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2009-01-09 08:01:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:02:41 -0500 |
commit | ba270ede101ad7439de7d4e92b71eece26db5c26 (patch) | |
tree | 45821fb28e6f7deeff128266649973f97d717465 | |
parent | 6095e08126790592699d8aeef4d31b263a4176a4 (diff) |
dmascc: convert to internal net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/82596.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index b273596368e3..cca94b9c08ae 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -1122,6 +1122,17 @@ static void print_eth(unsigned char *add, char *str) | |||
1122 | static int io = 0x300; | 1122 | static int io = 0x300; |
1123 | static int irq = 10; | 1123 | static int irq = 10; |
1124 | 1124 | ||
1125 | static const struct net_device_ops i596_netdev_ops = { | ||
1126 | .ndo_open = i596_open, | ||
1127 | .ndo_stop = i596_close, | ||
1128 | .ndo_start_xmit = i596_start_xmit, | ||
1129 | .ndo_set_multicast_list = set_multicast_list, | ||
1130 | .ndo_tx_timeout = i596_tx_timeout, | ||
1131 | .ndo_change_mtu = eth_change_mtu, | ||
1132 | .ndo_set_mac_address = eth_mac_addr, | ||
1133 | .ndo_validate_addr = eth_validate_addr, | ||
1134 | }; | ||
1135 | |||
1125 | struct net_device * __init i82596_probe(int unit) | 1136 | struct net_device * __init i82596_probe(int unit) |
1126 | { | 1137 | { |
1127 | struct net_device *dev; | 1138 | struct net_device *dev; |
@@ -1232,11 +1243,7 @@ found: | |||
1232 | DEB(DEB_PROBE,printk(KERN_INFO "%s", version)); | 1243 | DEB(DEB_PROBE,printk(KERN_INFO "%s", version)); |
1233 | 1244 | ||
1234 | /* The 82596-specific entries in the device structure. */ | 1245 | /* The 82596-specific entries in the device structure. */ |
1235 | dev->open = i596_open; | 1246 | dev->netdev_ops = &i596_netdev_ops; |
1236 | dev->stop = i596_close; | ||
1237 | dev->hard_start_xmit = i596_start_xmit; | ||
1238 | dev->set_multicast_list = set_multicast_list; | ||
1239 | dev->tx_timeout = i596_tx_timeout; | ||
1240 | dev->watchdog_timeo = TX_TIMEOUT; | 1247 | dev->watchdog_timeo = TX_TIMEOUT; |
1241 | 1248 | ||
1242 | dev->ml_priv = (void *)(dev->mem_start); | 1249 | dev->ml_priv = (void *)(dev->mem_start); |