lkml.org 
[lkml]   [2014]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectlinux-next: manual merge of the bluetooth tree with the net/net-next trees
Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/ieee802154/6lowpan.c between commit 965801e1eb62 ("net: 6lowpan: fix
lowpan_header_create non-compression memcpy call") from the tree and
commit 8df8c56a5abc ("6lowpan: Moving generic compression code into
6lowpan_iphc.c") from the bluetooth tree.

I fixed it up (I applied the following patch to move the fix into
6lowpan_iphc.c) and can carry the fix as necessary (no action is
required).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Jan 2014 12:52:43 +1100
Subject: [PATCH] net: 6lowpan: fixup for code movement

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/ieee802154/6lowpan_iphc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ieee802154/6lowpan_iphc.c b/net/ieee802154/6lowpan_iphc.c
index 11840f9e46da..e14fe8b2c054 100644
--- a/net/ieee802154/6lowpan_iphc.c
+++ b/net/ieee802154/6lowpan_iphc.c
@@ -677,7 +677,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;
--
1.8.5.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-01-07 03:21    [W:0.133 / U:0.456 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site