diff options
Diffstat (limited to 'drivers/net/plip.c')
-rw-r--r-- | drivers/net/plip.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/net/plip.c b/drivers/net/plip.c index 1e965427b0e9..5d904f73345f 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c | |||
@@ -229,7 +229,7 @@ static inline void enable_parport_interrupts (struct net_device *dev) | |||
229 | if (dev->irq != -1) | 229 | if (dev->irq != -1) |
230 | { | 230 | { |
231 | struct parport *port = | 231 | struct parport *port = |
232 | ((struct net_local *)dev->priv)->pardev->port; | 232 | ((struct net_local *)netdev_priv(dev))->pardev->port; |
233 | port->ops->enable_irq (port); | 233 | port->ops->enable_irq (port); |
234 | } | 234 | } |
235 | } | 235 | } |
@@ -239,7 +239,7 @@ static inline void disable_parport_interrupts (struct net_device *dev) | |||
239 | if (dev->irq != -1) | 239 | if (dev->irq != -1) |
240 | { | 240 | { |
241 | struct parport *port = | 241 | struct parport *port = |
242 | ((struct net_local *)dev->priv)->pardev->port; | 242 | ((struct net_local *)netdev_priv(dev))->pardev->port; |
243 | port->ops->disable_irq (port); | 243 | port->ops->disable_irq (port); |
244 | } | 244 | } |
245 | } | 245 | } |
@@ -247,7 +247,7 @@ static inline void disable_parport_interrupts (struct net_device *dev) | |||
247 | static inline void write_data (struct net_device *dev, unsigned char data) | 247 | static inline void write_data (struct net_device *dev, unsigned char data) |
248 | { | 248 | { |
249 | struct parport *port = | 249 | struct parport *port = |
250 | ((struct net_local *)dev->priv)->pardev->port; | 250 | ((struct net_local *)netdev_priv(dev))->pardev->port; |
251 | 251 | ||
252 | port->ops->write_data (port, data); | 252 | port->ops->write_data (port, data); |
253 | } | 253 | } |
@@ -255,7 +255,7 @@ static inline void write_data (struct net_device *dev, unsigned char data) | |||
255 | static inline unsigned char read_status (struct net_device *dev) | 255 | static inline unsigned char read_status (struct net_device *dev) |
256 | { | 256 | { |
257 | struct parport *port = | 257 | struct parport *port = |
258 | ((struct net_local *)dev->priv)->pardev->port; | 258 | ((struct net_local *)netdev_priv(dev))->pardev->port; |
259 | 259 | ||
260 | return port->ops->read_status (port); | 260 | return port->ops->read_status (port); |
261 | } | 261 | } |
@@ -664,7 +664,6 @@ plip_receive_packet(struct net_device *dev, struct net_local *nl, | |||
664 | /* Inform the upper layer for the arrival of a packet. */ | 664 | /* Inform the upper layer for the arrival of a packet. */ |
665 | rcv->skb->protocol=plip_type_trans(rcv->skb, dev); | 665 | rcv->skb->protocol=plip_type_trans(rcv->skb, dev); |
666 | netif_rx_ni(rcv->skb); | 666 | netif_rx_ni(rcv->skb); |
667 | dev->last_rx = jiffies; | ||
668 | dev->stats.rx_bytes += rcv->length.h; | 667 | dev->stats.rx_bytes += rcv->length.h; |
669 | dev->stats.rx_packets++; | 668 | dev->stats.rx_packets++; |
670 | rcv->skb = NULL; | 669 | rcv->skb = NULL; |
@@ -1397,9 +1396,3 @@ static int __init plip_init (void) | |||
1397 | module_init(plip_init); | 1396 | module_init(plip_init); |
1398 | module_exit(plip_cleanup_module); | 1397 | module_exit(plip_cleanup_module); |
1399 | MODULE_LICENSE("GPL"); | 1398 | MODULE_LICENSE("GPL"); |
1400 | |||
1401 | /* | ||
1402 | * Local variables: | ||
1403 | * compile-command: "gcc -DMODULE -DMODVERSIONS -D__KERNEL__ -Wall -Wstrict-prototypes -O2 -g -fomit-frame-pointer -pipe -c plip.c" | ||
1404 | * End: | ||
1405 | */ | ||