diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:17 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:17 -0400 |
commit | 9583f3d9c00974911daf227cbaa12d6c1caaabad (patch) | |
tree | f37466204ecbfea37c7d567fd06c9bece0cc663d /drivers/net/3c509.c | |
parent | 962cf36c5bf6d2840b8d66ee9a606fae2f540bbd (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'drivers/net/3c509.c')
-rw-r--r-- | drivers/net/3c509.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 87d8795823d7..b9d097c9f6bb 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -1062,7 +1062,6 @@ el3_rx(struct net_device *dev) | |||
1062 | struct sk_buff *skb; | 1062 | struct sk_buff *skb; |
1063 | 1063 | ||
1064 | skb = dev_alloc_skb(pkt_len+5); | 1064 | skb = dev_alloc_skb(pkt_len+5); |
1065 | dev->stats.rx_bytes += pkt_len; | ||
1066 | if (el3_debug > 4) | 1065 | if (el3_debug > 4) |
1067 | printk("Receiving packet size %d status %4.4x.\n", | 1066 | printk("Receiving packet size %d status %4.4x.\n", |
1068 | pkt_len, rx_status); | 1067 | pkt_len, rx_status); |
@@ -1077,6 +1076,7 @@ el3_rx(struct net_device *dev) | |||
1077 | skb->protocol = eth_type_trans(skb,dev); | 1076 | skb->protocol = eth_type_trans(skb,dev); |
1078 | netif_rx(skb); | 1077 | netif_rx(skb); |
1079 | dev->last_rx = jiffies; | 1078 | dev->last_rx = jiffies; |
1079 | dev->stats.rx_bytes += pkt_len; | ||
1080 | dev->stats.rx_packets++; | 1080 | dev->stats.rx_packets++; |
1081 | continue; | 1081 | continue; |
1082 | } | 1082 | } |