summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-01-07 12:52:43 +1100
committerDavid S. Miller <davem@davemloft.net>2014-01-27 16:43:03 -0800
commitce60e0c4df5f95086d5c2662c5cfa0beb8181c6d (patch)
tree7f8ce1a64db85838f2f45090191e94e6dc33c040 /net
parentb679ef73edc251f6d200a7dd2396e9fef9e36fc3 (diff)
downloadop-kernel-dev-ce60e0c4df5f95086d5c2662c5cfa0beb8181c6d.zip
op-kernel-dev-ce60e0c4df5f95086d5c2662c5cfa0beb8181c6d.tar.gz
net: 6lowpan: fixup for code movement
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ieee802154/6lowpan_iphc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
index 083f905..860aa2d 100644
--- 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 */
- 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;
OpenPOWER on IntegriCloud