diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-03-12 12:13:06 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-09 00:41:30 -0300 |
| commit | 58115373e74c7ee18d0f54f00831649a6471a899 (patch) | |
| tree | 976c058a3f36020beb284509c98cb894345ca671 | |
| parent | eb55ef07a211eea95088eb0e6cdbd53cd65d9755 (diff) | |
| download | op-kernel-dev-58115373e74c7ee18d0f54f00831649a6471a899.zip op-kernel-dev-58115373e74c7ee18d0f54f00831649a6471a899.tar.gz | |
Bluetooth: Correct ediv in SMP
ediv is already in little endian order.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
| -rw-r--r-- | include/net/bluetooth/smp.h | 2 | ||||
| -rw-r--r-- | net/bluetooth/smp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h index 7b3acdd..ca356a7 100644 --- a/include/net/bluetooth/smp.h +++ b/include/net/bluetooth/smp.h @@ -77,7 +77,7 @@ struct smp_cmd_encrypt_info { #define SMP_CMD_MASTER_IDENT 0x07 struct smp_cmd_master_ident { - __u16 ediv; + __le16 ediv; __u8 rand[8]; } __packed; diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index deb1198..6fc7c47 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -956,7 +956,7 @@ int smp_distribute_keys(struct l2cap_conn *conn, __u8 force) HCI_SMP_LTK_SLAVE, 1, authenticated, enc.ltk, smp->enc_key_size, ediv, ident.rand); - ident.ediv = cpu_to_le16(ediv); + ident.ediv = ediv; smp_send_cmd(conn, SMP_CMD_MASTER_IDENT, sizeof(ident), &ident); |
