From: Sergio Paracuellos Date: Thu, 10 Nov 2016 18:16:40 +0000 (+0100) Subject: staging: wlan-ng: use GENMASK macro in different defines of p80211hdr.h X-Git-Tag: v4.10-rc1~148^2~279 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=408fec3ff8e1f9fa2d11e199d7a51f02c0dd788f;p=karo-tx-linux.git staging: wlan-ng: use GENMASK macro in different defines of p80211hdr.h This patch replace actual mask stuff using BIT macros with or operators to make use of GENMASK macro which simplifies code clearity and readibility. It applies for defines included in p80211hdr.h header file. Signed-off-by: Sergio Paracuellos Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h index c8f78d9923b8..2c44c613a586 100644 --- a/drivers/staging/wlan-ng/p80211hdr.h +++ b/drivers/staging/wlan-ng/p80211hdr.h @@ -131,9 +131,8 @@ /* SET_FC_FSTYPE(WLAN_FSTYPE_RTS) ); */ /*------------------------------------------------------------*/ -#define WLAN_GET_FC_FTYPE(n) ((((u16)(n)) & (BIT(2) | BIT(3))) >> 2) -#define WLAN_GET_FC_FSTYPE(n) ((((u16)(n)) & \ - (BIT(4) | BIT(5) | BIT(6) | BIT(7))) >> 4) +#define WLAN_GET_FC_FTYPE(n) ((((u16)(n)) & GENMASK(3, 2)) >> 2) +#define WLAN_GET_FC_FSTYPE(n) ((((u16)(n)) & GENMASK(7, 4)) >> 4) #define WLAN_GET_FC_TODS(n) ((((u16)(n)) & (BIT(8))) >> 8) #define WLAN_GET_FC_FROMDS(n) ((((u16)(n)) & (BIT(9))) >> 9) #define WLAN_GET_FC_ISWEP(n) ((((u16)(n)) & (BIT(14))) >> 14)