diff options
author | Andrei Emeltchenko <andrei.emeltchenko@intel.com> | 2012-03-12 06:13:06 -0400 |
---|---|---|
committer | Gustavo Padovan <gustavo@padovan.org> | 2012-05-08 23:41:30 -0400 |
commit | 58115373e74c7ee18d0f54f00831649a6471a899 (patch) | |
tree | 976c058a3f36020beb284509c98cb894345ca671 | |
parent | eb55ef07a211eea95088eb0e6cdbd53cd65d9755 (diff) |
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 7b3acdd29134..ca356a734920 100644 --- a/include/net/bluetooth/smp.h +++ b/include/net/bluetooth/smp.h | |||
@@ -77,7 +77,7 @@ struct smp_cmd_encrypt_info { | |||
77 | 77 | ||
78 | #define SMP_CMD_MASTER_IDENT 0x07 | 78 | #define SMP_CMD_MASTER_IDENT 0x07 |
79 | struct smp_cmd_master_ident { | 79 | struct smp_cmd_master_ident { |
80 | __u16 ediv; | 80 | __le16 ediv; |
81 | __u8 rand[8]; | 81 | __u8 rand[8]; |
82 | } __packed; | 82 | } __packed; |
83 | 83 | ||
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index deb119875fd9..6fc7c4708f3e 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) | |||
956 | HCI_SMP_LTK_SLAVE, 1, authenticated, | 956 | HCI_SMP_LTK_SLAVE, 1, authenticated, |
957 | enc.ltk, smp->enc_key_size, ediv, ident.rand); | 957 | enc.ltk, smp->enc_key_size, ediv, ident.rand); |
958 | 958 | ||
959 | ident.ediv = cpu_to_le16(ediv); | 959 | ident.ediv = ediv; |
960 | 960 | ||
961 | smp_send_cmd(conn, SMP_CMD_MASTER_IDENT, sizeof(ident), &ident); | 961 | smp_send_cmd(conn, SMP_CMD_MASTER_IDENT, sizeof(ident), &ident); |
962 | 962 | ||