diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-15 14:34:23 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-15 14:34:23 -0400 |
| commit | 3d02a9265c5414b07b372dde616174d3c89071a0 (patch) | |
| tree | 31d460804c19fb3e10c4e24a5921311735ce9f27 /net | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
| parent | 065a13e2cc665f6547dc7e8a9d6b6565badf940a (diff) | |
| download | linux-3.10-3d02a9265c5414b07b372dde616174d3c89071a0.tar.gz linux-3.10-3d02a9265c5414b07b372dde616174d3c89071a0.tar.bz2 linux-3.10-3d02a9265c5414b07b372dde616174d3c89071a0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/smp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 8c225ef349c..2ac8d50861e 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -32,6 +32,8 @@ #define SMP_TIMEOUT msecs_to_jiffies(30000) +#define AUTH_REQ_MASK 0x07 + static inline void swap128(u8 src[16], u8 dst[16]) { int i; @@ -230,7 +232,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn, req->max_key_size = SMP_MAX_ENC_KEY_SIZE; req->init_key_dist = 0; req->resp_key_dist = dist_keys; - req->auth_req = authreq; + req->auth_req = (authreq & AUTH_REQ_MASK); return; } @@ -239,7 +241,7 @@ static void build_pairing_cmd(struct l2cap_conn *conn, rsp->max_key_size = SMP_MAX_ENC_KEY_SIZE; rsp->init_key_dist = 0; rsp->resp_key_dist = req->resp_key_dist & dist_keys; - rsp->auth_req = authreq; + rsp->auth_req = (authreq & AUTH_REQ_MASK); } static u8 check_enc_key_size(struct l2cap_conn *conn, __u8 max_key_size) |