tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
staging: ks7010: review custom bit defines using macros from bitops header file
This commit reviews custom definitions using custom bit macros changing
them for the ones defined in the bitops header file.
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
authored by
Sergio Paracuellos
and committed by
Greg Kroah-Hartman
5fa7ed32
38fc31e7
+15
-16
+15
-16
drivers/staging/ks7010/eap_packet.h
+15
-16
drivers/staging/ks7010/eap_packet.h
···
3
3
#define EAP_PACKET_H
4
4
5
5
#include <linux/compiler.h>
6
+
#include <linux/bitops.h>
6
7
#include <uapi/linux/if_ether.h>
7
-
8
-
#define WBIT(n) (1 << (n))
9
8
10
9
#define ETHER_HDR_SIZE 20
11
10
···
97
98
/* followed by key_data_length bytes of key_data */
98
99
} __packed;
99
100
100
-
#define WPA_KEY_INFO_TYPE_MASK (WBIT(0) | WBIT(1) | WBIT(2))
101
-
#define WPA_KEY_INFO_TYPE_HMAC_MD5_RC4 WBIT(0)
102
-
#define WPA_KEY_INFO_TYPE_HMAC_SHA1_AES WBIT(1)
103
-
#define WPA_KEY_INFO_KEY_TYPE WBIT(3) /* 1 = Pairwise, 0 = Group key */
101
+
#define WPA_KEY_INFO_TYPE_MASK GENMASK(2, 0)
102
+
#define WPA_KEY_INFO_TYPE_HMAC_MD5_RC4 BIT(0)
103
+
#define WPA_KEY_INFO_TYPE_HMAC_SHA1_AES BIT(1)
104
+
#define WPA_KEY_INFO_KEY_TYPE BIT(3) /* 1 = Pairwise, 0 = Group key */
104
105
/* bit4..5 is used in WPA, but is reserved in IEEE 802.11i/RSN */
105
-
#define WPA_KEY_INFO_KEY_INDEX_MASK (WBIT(4) | WBIT(5))
106
+
#define WPA_KEY_INFO_KEY_INDEX_MASK GENMASK(5, 4)
106
107
#define WPA_KEY_INFO_KEY_INDEX_SHIFT 4
107
-
#define WPA_KEY_INFO_INSTALL WBIT(6) /* pairwise */
108
-
#define WPA_KEY_INFO_TXRX WBIT(6) /* group */
109
-
#define WPA_KEY_INFO_ACK WBIT(7)
110
-
#define WPA_KEY_INFO_MIC WBIT(8)
111
-
#define WPA_KEY_INFO_SECURE WBIT(9)
112
-
#define WPA_KEY_INFO_ERROR WBIT(10)
113
-
#define WPA_KEY_INFO_REQUEST WBIT(11)
114
-
#define WPA_KEY_INFO_ENCR_KEY_DATA WBIT(12) /* IEEE 802.11i/RSN only */
108
+
#define WPA_KEY_INFO_INSTALL BIT(6) /* pairwise */
109
+
#define WPA_KEY_INFO_TXRX BIT(6) /* group */
110
+
#define WPA_KEY_INFO_ACK BIT(7)
111
+
#define WPA_KEY_INFO_MIC BIT(8)
112
+
#define WPA_KEY_INFO_SECURE BIT(9)
113
+
#define WPA_KEY_INFO_ERROR BIT(10)
114
+
#define WPA_KEY_INFO_REQUEST BIT(11)
115
+
#define WPA_KEY_INFO_ENCR_KEY_DATA BIT(12) /* IEEE 802.11i/RSN only */
115
116
116
-
#define WPA_CAPABILITY_PREAUTH WBIT(0)
117
+
#define WPA_CAPABILITY_PREAUTH BIT(0)
117
118
118
119
#define GENERIC_INFO_ELEM 0xdd
119
120
#define RSN_INFO_ELEM 0x30