diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2009-01-09 08:01:24 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:02:30 -0500 |
commit | efda072393fb4213e43d92bdd20cf180a06a8eb0 (patch) | |
tree | 99b7d32f5d632b4cb3205a32f2026e0d7d85cfe9 | |
parent | dcc59a9789fee98782aa2f3215bbea071bd643b1 (diff) |
olympic: convert to 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/tokenring/olympic.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 71fed1e20223..77dc9da4c0b9 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -194,6 +194,15 @@ static void olympic_srb_bh(struct net_device *dev) ; | |||
194 | static void olympic_asb_bh(struct net_device *dev) ; | 194 | static void olympic_asb_bh(struct net_device *dev) ; |
195 | static int olympic_proc_info(char *buffer, char **start, off_t offset, int length, int *eof, void *data) ; | 195 | static int olympic_proc_info(char *buffer, char **start, off_t offset, int length, int *eof, void *data) ; |
196 | 196 | ||
197 | static const struct net_device_ops olympic_netdev_ops = { | ||
198 | .ndo_open = olympic_open, | ||
199 | .ndo_stop = olympic_close, | ||
200 | .ndo_start_xmit = olympic_xmit, | ||
201 | .ndo_change_mtu = olympic_change_mtu, | ||
202 | .ndo_set_multicast_list = olympic_set_rx_mode, | ||
203 | .ndo_set_mac_address = olympic_set_mac_address, | ||
204 | }; | ||
205 | |||
197 | static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 206 | static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
198 | { | 207 | { |
199 | struct net_device *dev ; | 208 | struct net_device *dev ; |
@@ -252,13 +261,7 @@ static int __devinit olympic_probe(struct pci_dev *pdev, const struct pci_device | |||
252 | goto op_free_iomap; | 261 | goto op_free_iomap; |
253 | } | 262 | } |
254 | 263 | ||
255 | dev->open=&olympic_open; | 264 | dev->netdev_ops = &olympic_netdev_ops; |
256 | dev->hard_start_xmit=&olympic_xmit; | ||
257 | dev->change_mtu=&olympic_change_mtu; | ||
258 | dev->stop=&olympic_close; | ||
259 | dev->do_ioctl=NULL; | ||
260 | dev->set_multicast_list=&olympic_set_rx_mode; | ||
261 | dev->set_mac_address=&olympic_set_mac_address ; | ||
262 | SET_NETDEV_DEV(dev, &pdev->dev); | 265 | SET_NETDEV_DEV(dev, &pdev->dev); |
263 | 266 | ||
264 | pci_set_drvdata(pdev,dev) ; | 267 | pci_set_drvdata(pdev,dev) ; |