diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 08:29:08 +0300 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2009-01-14 08:29:08 +0300 |
| commit | c088f4e9da74b901f7ed1749ad697d77622ed0f9 (patch) | |
| tree | 84cddf20369f82f10c1c3712e6cce20dd1b9d863 /drivers/net/plip.c | |
| parent | ce79735c12d62c3cda38eb31762cf98e87c7b087 (diff) | |
| parent | a6525042bfdfcab128bd91fad264de10fd24a55e (diff) | |
| download | linux-c088f4e9da74b901f7ed1749ad697d77622ed0f9.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/plip.c')
| -rw-r--r-- | drivers/net/plip.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/plip.c b/drivers/net/plip.c index 0c46d603b8fe..0be0f0b164f3 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c @@ -265,6 +265,13 @@ static const struct header_ops plip_header_ops = { .cache = plip_hard_header_cache, }; +static const struct net_device_ops plip_netdev_ops = { + .ndo_open = plip_open, + .ndo_stop = plip_close, + .ndo_start_xmit = plip_tx_packet, + .ndo_do_ioctl = plip_ioctl, +}; + /* Entry point of PLIP driver. Probe the hardware, and register/initialize the driver. @@ -280,15 +287,11 @@ plip_init_netdev(struct net_device *dev) struct net_local *nl = netdev_priv(dev); /* Then, override parts of it */ - dev->hard_start_xmit = plip_tx_packet; - dev->open = plip_open; - dev->stop = plip_close; - dev->do_ioctl = plip_ioctl; - dev->tx_queue_len = 10; dev->flags = IFF_POINTOPOINT|IFF_NOARP; memset(dev->dev_addr, 0xfc, ETH_ALEN); + dev->netdev_ops = &plip_netdev_ops; dev->header_ops = &plip_header_ops; |