diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-15 15:26:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-15 15:26:05 -0700 |
| commit | 2ea214929d601a9308e47c3d380e50315963ce42 (patch) | |
| tree | 17ec73bfcf487fa7511be25618b4fd0d2c04c22d /include/net/bluetooth/smp.h | |
| parent | 1b3a6926fc3430116c97c333f7cf901b86779008 (diff) | |
| parent | 16698918cdb39ae0d9289741ac2a9ed179f8b8ba (diff) | |
| download | op-kernel-dev-2ea214929d601a9308e47c3d380e50315963ce42.zip op-kernel-dev-2ea214929d601a9308e47c3d380e50315963ce42.tar.gz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
John W. Linville says:
====================
This is a batch of updates intended for 3.7. The ath9k, mwifiex,
and b43 drivers get the bulk of the commits this time, with a handful
of other driver bits thrown-in. It is mostly just minor fixes and
cleanups, etc.
Also included is a Bluetooth pull, with a lot of refactoring.
Gustavo says:
"These are the changes I queued for 3.7. There are a many
small fixes/improvements by Andre Guedes. A l2cap channel
refcounting refactor by Jaganath. Bluetooth sockets now
appears in /proc/net, by Masatake Yamato and Sachin Kamat
changes ours drivers to use devm_kzalloc()."
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/bluetooth/smp.h')
| -rw-r--r-- | include/net/bluetooth/smp.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h index ca356a7..50993a5 100644 --- a/include/net/bluetooth/smp.h +++ b/include/net/bluetooth/smp.h @@ -108,8 +108,8 @@ struct smp_cmd_security_req { #define SMP_CONFIRM_FAILED 0x04 #define SMP_PAIRING_NOTSUPP 0x05 #define SMP_ENC_KEY_SIZE 0x06 -#define SMP_CMD_NOTSUPP 0x07 -#define SMP_UNSPECIFIED 0x08 +#define SMP_CMD_NOTSUPP 0x07 +#define SMP_UNSPECIFIED 0x08 #define SMP_REPEATED_ATTEMPTS 0x09 #define SMP_MIN_ENC_KEY_SIZE 7 @@ -123,8 +123,8 @@ struct smp_chan { struct l2cap_conn *conn; u8 preq[7]; /* SMP Pairing Request */ u8 prsp[7]; /* SMP Pairing Response */ - u8 prnd[16]; /* SMP Pairing Random (local) */ - u8 rrnd[16]; /* SMP Pairing Random (remote) */ + u8 prnd[16]; /* SMP Pairing Random (local) */ + u8 rrnd[16]; /* SMP Pairing Random (remote) */ u8 pcnf[16]; /* SMP Pairing Confirm */ u8 tk[16]; /* SMP Temporary Key */ u8 enc_key_size; |
