projects
/
linux-2.6-block.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
[linux-2.6-block.git]
/
drivers
/
infiniband
/
ulp
/
ipoib
/
ipoib_ib.c
diff --git
a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index c17e777cdc4715bd721b9a165c4bf82b39b65d42..1bdb9101911ae779285693f38a39304bd1bcbba0 100644
(file)
--- a/
drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/
drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@
-216,7
+216,7
@@
static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
if (wc->slid != priv->local_lid ||
wc->src_qp != priv->qp->qp_num) {
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;