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 branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[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
da7e102
..
0c4e59b
100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/
drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@
-406,7
+406,7
@@
void ipoib_cm_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
skb_put_frags(skb, IPOIB_CM_HEAD_SIZE, wc->byte_len, newskb);
skb->protocol = ((struct ipoib_header *) skb->data)->proto;
- skb
->mac.raw = skb->data
;
+ skb
_reset_mac_header(skb)
;
skb_pull(skb, IPOIB_ENCAP_LEN);
dev->last_rx = jiffies;