]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bluetooth/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 02:45:49 +0000 (13:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Jan 2014 02:45:50 +0000 (13:45 +1100)
1  2 
net/ieee802154/6lowpan_iphc.c

index 11840f9e46daa7fee49fb08d750d378f150561d8,11840f9e46daa7fee49fb08d750d378f150561d8..e14fe8b2c054c9a717970cc3ef0638000e8765ff
@@@ -677,7 -677,7 +677,7 @@@ int lowpan_header_compress(struct sk_bu
                        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;