Skip to content

Commit

Permalink
lanstreamer: convert to net_device_ops
Browse files Browse the repository at this point in the history
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Jan 21, 2009
1 parent 37423ff commit be18827
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions drivers/net/tokenring/lanstreamer.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,18 @@ struct streamer_private *dev_streamer=NULL;
#endif
#endif

static const struct net_device_ops streamer_netdev_ops = {
.ndo_open = streamer_open,
.ndo_stop = streamer_close,
.ndo_start_xmit = streamer_xmit,
.ndo_change_mtu = streamer_change_mtu,
#if STREAMER_IOCTL
.ndo_do_ioctl = streamer_ioctl,
#endif
.ndo_set_multicast_list = streamer_set_rx_mode,
.ndo_set_mac_address = streamer_set_mac_address,
};

static int __devinit streamer_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
Expand Down Expand Up @@ -320,17 +332,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
init_waitqueue_head(&streamer_priv->srb_wait);
init_waitqueue_head(&streamer_priv->trb_wait);

dev->open = &streamer_open;
dev->hard_start_xmit = &streamer_xmit;
dev->change_mtu = &streamer_change_mtu;
dev->stop = &streamer_close;
#if STREAMER_IOCTL
dev->do_ioctl = &streamer_ioctl;
#else
dev->do_ioctl = NULL;
#endif
dev->set_multicast_list = &streamer_set_rx_mode;
dev->set_mac_address = &streamer_set_mac_address;
dev->netdev_ops = &streamer_netdev_ops;
dev->irq = pdev->irq;
dev->base_addr=pio_start;
SET_NETDEV_DEV(dev, &pdev->dev);
Expand Down

0 comments on commit be18827

Please sign in to comment.