projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-for-v3.14' of git://git.linaro.org/people/mszyprowski/linux-dma...
[firefly-linux-kernel-4.4.55.git]
/
net
/
ieee802154
/
6lowpan_iphc.c
diff --git
a/net/ieee802154/6lowpan_iphc.c
b/net/ieee802154/6lowpan_iphc.c
index 083f905bf1096d748a90e3a2bff52983a936a680..860aa2d445bae361d5d588a6c1a4e41310d0d629 100644
(file)
--- a/
net/ieee802154/6lowpan_iphc.c
+++ b/
net/ieee802154/6lowpan_iphc.c
@@
-678,7
+678,7
@@
int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
hc06_ptr += 3;
} else {
/* compress nothing */
hc06_ptr += 3;
} else {
/* compress nothing */
- memcpy(hc06_ptr,
&
hdr, 4);
+ memcpy(hc06_ptr, hdr, 4);
/* replace the top byte with new ECN | DSCP format */
*hc06_ptr = tmp;
hc06_ptr += 4;
/* replace the top byte with new ECN | DSCP format */
*hc06_ptr = tmp;
hc06_ptr += 4;