diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-07 02:07:35 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-07 02:07:35 -0400 |
commit | d763d5edf945eec47bd443b699f174976f0afc13 (patch) | |
tree | 3e5cd46b9a783999716bf92176854f4f1215d930 /drivers/net/3c509.c | |
parent | 790e2a290b499b0400254e6870ec27969065d122 (diff) | |
parent | 1b40a895df6c7d5a80e71f65674060b03d84bbef (diff) |
Merge branch 'linus' into tracing/mmiotrace
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 | } |