net: Remove usage of net_device last_rx member

[linux.git] / drivers / net / ethernet / realtek / atp.c

diff --git a/drivers/net/ethernet/realtek/atp.c b/drivers/net/ethernet/realtek/atp.c
index 570ed3bd3cbfcd0cbe1dc0ce5764823d1fc70ff6..9bcd4aefc9c507af16325c6099fdfa198998b93e 100644 (file)
--- a/drivers/net/ethernet/realtek/atp.c
+++ b/drivers/net/ethernet/realtek/atp.c
@@ -170,7 +170,7 @@ struct net_local {
     spinlock_t lock;
     struct net_device *next_module;
     struct timer_list timer;   /* Media selection timer. */
-    long last_rx_time;         /* Last Rx, in jiffies, to handle Rx hang. */
+    unsigned long last_rx_time;        /* Last Rx, in jiffies, to handle Rx hang. */
     int saved_tx_size;
     unsigned int tx_unit_busy:1;
     unsigned char re_tx,       /* Number of packet retransmissions. */
@@ -668,11 +668,11 @@ static irqreturn_t atp_interrupt(int irq, void *dev_instance)
                        }
                        num_tx_since_rx++;
                } else if (num_tx_since_rx > 8 &&
-                          time_after(jiffies, dev->last_rx + HZ)) {
+                          time_after(jiffies, lp->last_rx_time + HZ)) {
                        if (net_debug > 2)
                                printk(KERN_DEBUG "%s: Missed packet? No Rx after %d Tx and "
                                           "%ld jiffies status %02x  CMR1 %02x.\n", dev->name,
-                                          num_tx_since_rx, jiffies - dev->last_rx, status,
+                                          num_tx_since_rx, jiffies - lp->last_rx_time, status,
                                           (read_nibble(ioaddr, CMR1) >> 3) & 15);
                        dev->stats.rx_missed_errors++;
                        hardware_init(dev);
@@ -789,7 +789,6 @@ static void net_rx(struct net_device *dev)
                read_block(ioaddr, pkt_len, skb_put(skb,pkt_len), dev->if_port);
                skb->protocol = eth_type_trans(skb, dev);
                netif_rx(skb);
-               dev->last_rx = jiffies;
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pkt_len;
        }