summaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlan-ng
diff options
context:
space:
mode:
authorTim Collier2018-06-22 21:39:33 +0200
committerGreg Kroah-Hartman2018-06-28 15:12:50 +0200
commitb2679009fa7def0772bff1af4b7579dc2d8ff442 (patch)
treeea5493b3ffd9266eb7c9ca0d5ee9b6a5ed13bf21 /drivers/staging/wlan-ng
parentstaging: wlan-ng: replace WLAN_CTL_FRAMELEN with inline function in p80211hdr.h (diff)
downloadkernel-qcow2-linux-b2679009fa7def0772bff1af4b7579dc2d8ff442.tar.gz
kernel-qcow2-linux-b2679009fa7def0772bff1af4b7579dc2d8ff442.tar.xz
kernel-qcow2-linux-b2679009fa7def0772bff1af4b7579dc2d8ff442.zip
staging: wlan-ng: replace macro with inline function in prism2mgmt.c
checkpatch gives the following message for the p80211rate_to_p2bit macro: CHECK: Macro argument reuse 'n' - possible side-effects? To fix the message, replace the macro with an equivalent inline function. Signed-off-by: Tim Collier <osdevtc@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wlan-ng')
-rw-r--r--drivers/staging/wlan-ng/prism2mgmt.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index d7de9e9c47a2..28e4029d46f6 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -85,10 +85,21 @@
#include "prism2mgmt.h"
/* Converts 802.11 format rate specifications to prism2 */
-#define p80211rate_to_p2bit(n) ((((n) & ~BIT(7)) == 2) ? BIT(0) : \
- (((n) & ~BIT(7)) == 4) ? BIT(1) : \
- (((n) & ~BIT(7)) == 11) ? BIT(2) : \
- (((n) & ~BIT(7)) == 22) ? BIT(3) : 0)
+static inline u16 p80211rate_to_p2bit(u32 rate)
+{
+ switch (rate & ~BIT(7)) {
+ case 2:
+ return BIT(0);
+ case 4:
+ return BIT(1);
+ case 11:
+ return BIT(2);
+ case 22:
+ return BIT(3);
+ default:
+ return 0;
+ }
+}
/*----------------------------------------------------------------
* prism2mgmt_scan