diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-04-15 08:52:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-04-16 05:20:15 -0400 |
commit | 71f4367ca24830d967fca7a9c1cfb944b08742e5 (patch) | |
tree | b75b062de5890be1c2804da78d0ceb57d6340f2a | |
parent | 52b031ff3987a079ea759d81447312f1665dbfbd (diff) |
lib82596: convert to net_device_ops
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/lib82596.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 7415f517491d..070fa4500871 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -1036,6 +1036,19 @@ static void print_eth(unsigned char *add, char *str) | |||
1036 | printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n", | 1036 | printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n", |
1037 | add, add + 6, add, add[12], add[13], str); | 1037 | add, add + 6, add, add[12], add[13], str); |
1038 | } | 1038 | } |
1039 | static const struct net_device_ops i596_netdev_ops = { | ||
1040 | .ndo_open = i596_open, | ||
1041 | .ndo_stop = i596_close, | ||
1042 | .ndo_start_xmit = i596_start_xmit, | ||
1043 | .ndo_set_multicast_list = set_multicast_list, | ||
1044 | .ndo_tx_timeout = i596_tx_timeout, | ||
1045 | .ndo_change_mtu = eth_change_mtu, | ||
1046 | .ndo_validate_addr = eth_validate_addr, | ||
1047 | .ndo_set_mac_address = eth_mac_addr, | ||
1048 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
1049 | .ndo_poll_controller = i596_poll_controller, | ||
1050 | #endif | ||
1051 | }; | ||
1039 | 1052 | ||
1040 | static int __devinit i82596_probe(struct net_device *dev) | 1053 | static int __devinit i82596_probe(struct net_device *dev) |
1041 | { | 1054 | { |
@@ -1062,16 +1075,8 @@ static int __devinit i82596_probe(struct net_device *dev) | |||
1062 | return -ENOMEM; | 1075 | return -ENOMEM; |
1063 | } | 1076 | } |
1064 | 1077 | ||
1065 | /* The 82596-specific entries in the device structure. */ | 1078 | dev->netdev_ops = &i596_netdev_ops; |
1066 | dev->open = i596_open; | ||
1067 | dev->stop = i596_close; | ||
1068 | dev->hard_start_xmit = i596_start_xmit; | ||
1069 | dev->set_multicast_list = set_multicast_list; | ||
1070 | dev->tx_timeout = i596_tx_timeout; | ||
1071 | dev->watchdog_timeo = TX_TIMEOUT; | 1079 | dev->watchdog_timeo = TX_TIMEOUT; |
1072 | #ifdef CONFIG_NET_POLL_CONTROLLER | ||
1073 | dev->poll_controller = i596_poll_controller; | ||
1074 | #endif | ||
1075 | 1080 | ||
1076 | memset(dma, 0, sizeof(struct i596_dma)); | 1081 | memset(dma, 0, sizeof(struct i596_dma)); |
1077 | lp->dma = dma; | 1082 | lp->dma = dma; |