diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-13 16:23:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-13 16:23:11 -0700 |
| commit | 182ad468e70fc7e8ff2e5d64344c690beaa00ddd (patch) | |
| tree | af0b9b8da89ed03629c71f6829845c301485d289 /net/bluetooth/mgmt.c | |
| parent | e8fed985d7bd6cda695e196028b54a5f3d2d91bb (diff) | |
| parent | 5b3e2e14eaa2a98232a4f292341fb88438685734 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cavium/Kconfig
The cavium conflict was overlapping dependency
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/mgmt.c')
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 7ab191589541..e435438f95f0 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -7843,7 +7843,7 @@ void mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, bool persistent) /* Make sure we copy only the significant bytes based on the * encryption key size, and set the rest of the value to zeroes. */ - memcpy(ev.key.val, key->val, sizeof(key->enc_size)); + memcpy(ev.key.val, key->val, key->enc_size); memset(ev.key.val + key->enc_size, 0, sizeof(ev.key.val) - key->enc_size); |