git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[pandora-kernel.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib_cm.c
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index
8f4b4fc
..
30bdf42
100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/
drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@
-662,7
+662,6
@@
copied:
skb_reset_mac_header(skb);
skb_pull(skb, IPOIB_ENCAP_LEN);
- dev->last_rx = jiffies;
++dev->stats.rx_packets;
dev->stats.rx_bytes += skb->len;