diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:03:12 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 13:06:46 +1100 |
| commit | cf76a3a7b8292423b127f6c0ecbacac8e65d40ad (patch) | |
| tree | 8fc46b6d104d5fdc68f5bbf7e380243c6fb5cc19 /drivers/net/smc911x.c | |
| parent | eabeb7dac4934602a90b14649c07c13eb7e43d90 (diff) | |
| parent | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (diff) | |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/smc911x.c')
| -rw-r--r-- | drivers/net/smc911x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 9a16a79b67d0..21d823c0892c 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -439,7 +439,6 @@ static inline void smc911x_rcv(struct net_device *dev) DBG(SMC_DEBUG_PKTS, "%s: Received packet\n", dev->name); PRINT_PKT(data, ((pkt_len - 4) <= 64) ? pkt_len - 4 : 64); - dev->last_rx = jiffies; skb->protocol = eth_type_trans(skb, dev); netif_rx(skb); dev->stats.rx_packets++; @@ -1231,7 +1230,6 @@ smc911x_rx_dma_irq(int dma, void *data) BUG_ON(skb == NULL); lp->current_rx_skb = NULL; PRINT_PKT(skb->data, skb->len); - dev->last_rx = jiffies; skb->protocol = eth_type_trans(skb, dev); dev->stats.rx_packets++; dev->stats.rx_bytes += skb->len; |