diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2009-01-09 08:01:22 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:02:29 -0500 |
commit | be18827815bc62f64797da05bcba9ba69101524d (patch) | |
tree | 485671f44c26129bdba8721ae325ef0cd7207a67 | |
parent | 37423fff4f02fcf6867971dfd678e99a34efeab3 (diff) |
lanstreamer: 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/lanstreamer.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index ecfa564489c4..0b2b7925da22 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -221,6 +221,18 @@ struct streamer_private *dev_streamer=NULL; | |||
221 | #endif | 221 | #endif |
222 | #endif | 222 | #endif |
223 | 223 | ||
224 | static const struct net_device_ops streamer_netdev_ops = { | ||
225 | .ndo_open = streamer_open, | ||
226 | .ndo_stop = streamer_close, | ||
227 | .ndo_start_xmit = streamer_xmit, | ||
228 | .ndo_change_mtu = streamer_change_mtu, | ||
229 | #if STREAMER_IOCTL | ||
230 | .ndo_do_ioctl = streamer_ioctl, | ||
231 | #endif | ||
232 | .ndo_set_multicast_list = streamer_set_rx_mode, | ||
233 | .ndo_set_mac_address = streamer_set_mac_address, | ||
234 | }; | ||
235 | |||
224 | static int __devinit streamer_init_one(struct pci_dev *pdev, | 236 | static int __devinit streamer_init_one(struct pci_dev *pdev, |
225 | const struct pci_device_id *ent) | 237 | const struct pci_device_id *ent) |
226 | { | 238 | { |
@@ -320,17 +332,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev, | |||
320 | init_waitqueue_head(&streamer_priv->srb_wait); | 332 | init_waitqueue_head(&streamer_priv->srb_wait); |
321 | init_waitqueue_head(&streamer_priv->trb_wait); | 333 | init_waitqueue_head(&streamer_priv->trb_wait); |
322 | 334 | ||
323 | dev->open = &streamer_open; | 335 | dev->netdev_ops = &streamer_netdev_ops; |
324 | dev->hard_start_xmit = &streamer_xmit; | ||
325 | dev->change_mtu = &streamer_change_mtu; | ||
326 | dev->stop = &streamer_close; | ||
327 | #if STREAMER_IOCTL | ||
328 | dev->do_ioctl = &streamer_ioctl; | ||
329 | #else | ||
330 | dev->do_ioctl = NULL; | ||
331 | #endif | ||
332 | dev->set_multicast_list = &streamer_set_rx_mode; | ||
333 | dev->set_mac_address = &streamer_set_mac_address; | ||
334 | dev->irq = pdev->irq; | 336 | dev->irq = pdev->irq; |
335 | dev->base_addr=pio_start; | 337 | dev->base_addr=pio_start; |
336 | SET_NETDEV_DEV(dev, &pdev->dev); | 338 | SET_NETDEV_DEV(dev, &pdev->dev); |