From: Johan Hedberg Date: Fri, 5 Sep 2014 19:19:53 +0000 (+0300) Subject: Bluetooth: Add define for key distribution mask X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=88d3a8acf33e8f4989a1032998eb819a89829573;p=linux-beck.git Bluetooth: Add define for key distribution mask This patch adds a define for the allowed bits of the key distribution mask so we don't have to have magic 0x07 constants throughout the code. Signed-off-by: Johan Hedberg Signed-off-by: Marcel Holtmann --- diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index c71589f4b435..5003d224c4b6 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -34,6 +34,7 @@ #define SMP_TIMEOUT msecs_to_jiffies(30000) #define AUTH_REQ_MASK 0x07 +#define KEY_DIST_MASK 0x07 enum { SMP_FLAG_TK_VALID, @@ -703,7 +704,7 @@ static void smp_distribute_keys(struct smp_chan *smp) rsp = (void *) &smp->prsp[1]; /* The responder sends its keys first */ - if (hcon->out && (smp->remote_key_dist & 0x07)) + if (hcon->out && (smp->remote_key_dist & KEY_DIST_MASK)) return; req = (void *) &smp->preq[1]; @@ -789,7 +790,7 @@ static void smp_distribute_keys(struct smp_chan *smp) } /* If there are still keys to be received wait for them */ - if ((smp->remote_key_dist & 0x07)) + if (smp->remote_key_dist & KEY_DIST_MASK) return; set_bit(SMP_FLAG_COMPLETE, &smp->flags);