1 files changed, 1 insertions, 16 deletions

diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index ef8f96d2c059..be8371b4eb63 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -32,7 +32,6 @@
 #include "smp.h"
 
 #define SMP_ALLOW_CMD(smp, code)        set_bit(code, &smp->allow_cmd)
-#define SMP_DISALLOW_CMD(smp, code)     clear_bit(code, &smp->allow_cmd)
 
 #define SMP_TIMEOUT     msecs_to_jiffies(30000)
 
@@ -956,8 +955,6 @@ static u8 smp_cmd_pairing_req(struct l2cap_conn *conn, struct sk_buff *skb)
             (auth & SMP_AUTH_BONDING))
                 return SMP_PAIRING_NOTSUPP;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_PAIRING_REQ);
-
         smp->preq[0] = SMP_CMD_PAIRING_REQ;
         memcpy(&smp->preq[1], req, sizeof(*req));
         skb_pull(skb, sizeof(*req));
@@ -1014,8 +1011,6 @@ static u8 smp_cmd_pairing_rsp(struct l2cap_conn *conn, struct sk_buff *skb)
         if (conn->hcon->role != HCI_ROLE_MASTER)
                 return SMP_CMD_NOTSUPP;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_PAIRING_RSP);
-
         skb_pull(skb, sizeof(*rsp));
 
         req = (void *) &smp->preq[1];
@@ -1071,8 +1066,6 @@ static u8 smp_cmd_pairing_confirm(struct l2cap_conn *conn, struct sk_buff *skb)
         if (skb->len < sizeof(smp->pcnf))
                 return SMP_INVALID_PARAMS;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_PAIRING_CONFIRM);
-
         memcpy(smp->pcnf, skb->data, sizeof(smp->pcnf));
         skb_pull(skb, sizeof(smp->pcnf));
 
@@ -1101,8 +1094,6 @@ static u8 smp_cmd_pairing_random(struct l2cap_conn *conn, struct sk_buff *skb)
         if (skb->len < sizeof(smp->rrnd))
                 return SMP_INVALID_PARAMS;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_PAIRING_RANDOM);
-
         memcpy(smp->rrnd, skb->data, sizeof(smp->rrnd));
         skb_pull(skb, sizeof(smp->rrnd));
 
@@ -1293,7 +1284,6 @@ static int smp_cmd_encrypt_info(struct l2cap_conn *conn, struct sk_buff *skb)
         if (skb->len < sizeof(*rp))
                 return SMP_INVALID_PARAMS;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_ENCRYPT_INFO);
         SMP_ALLOW_CMD(smp, SMP_CMD_MASTER_IDENT);
 
         skb_pull(skb, sizeof(*rp));
@@ -1321,7 +1311,6 @@ static int smp_cmd_master_ident(struct l2cap_conn *conn, struct sk_buff *skb)
         /* Mark the information as received */
         smp->remote_key_dist &= ~SMP_DIST_ENC_KEY;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_MASTER_IDENT);
         if (smp->remote_key_dist & SMP_DIST_ID_KEY)
                 SMP_ALLOW_CMD(smp, SMP_CMD_IDENT_INFO);
         else if (smp->remote_key_dist & SMP_DIST_SIGN)
@@ -1353,7 +1342,6 @@ static int smp_cmd_ident_info(struct l2cap_conn *conn, struct sk_buff *skb)
         if (skb->len < sizeof(*info))
                 return SMP_INVALID_PARAMS;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_IDENT_INFO);
         SMP_ALLOW_CMD(smp, SMP_CMD_IDENT_ADDR_INFO);
 
         skb_pull(skb, sizeof(*info));
@@ -1380,7 +1368,6 @@ static int smp_cmd_ident_addr_info(struct l2cap_conn *conn,
         /* Mark the information as received */
         smp->remote_key_dist &= ~SMP_DIST_ID_KEY;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_IDENT_ADDR_INFO);
         if (smp->remote_key_dist & SMP_DIST_SIGN)
                 SMP_ALLOW_CMD(smp, SMP_CMD_SIGN_INFO);
 
@@ -1436,8 +1423,6 @@ static int smp_cmd_sign_info(struct l2cap_conn *conn, struct sk_buff *skb)
         /* Mark the information as received */
         smp->remote_key_dist &= ~SMP_DIST_SIGN;
 
-        SMP_DISALLOW_CMD(smp, SMP_CMD_SIGN_INFO);
-
         skb_pull(skb, sizeof(*rp));
 
         hci_dev_lock(hdev);
@@ -1482,7 +1467,7 @@ static int smp_sig_channel(struct l2cap_chan *chan, struct sk_buff *skb)
         if (code > SMP_CMD_MAX)
                 goto drop;
 
-        if (smp && !test_bit(code, &smp->allow_cmd))
+        if (smp && !test_and_clear_bit(code, &smp->allow_cmd))
                 goto drop;
 
         /* If we don't have a context the only allowed commands are