|
@@ -91,7 +91,7 @@ static const struct file_operations reset_ops = {
|
|
|
};
|
|
|
#endif
|
|
|
|
|
|
-static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = {
|
|
|
+static const char *hw_flag_names[] = {
|
|
|
#define FLAG(F) [IEEE80211_HW_##F] = #F
|
|
|
FLAG(HAS_RATE_CONTROL),
|
|
|
FLAG(RX_INCLUDES_FCS),
|
|
@@ -126,9 +126,6 @@ static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = {
|
|
|
FLAG(SUPPORTS_AMSDU_IN_AMPDU),
|
|
|
FLAG(BEACON_TX_STATUS),
|
|
|
FLAG(NEEDS_UNIQUE_STA_ADDR),
|
|
|
-
|
|
|
- /* keep last for the build bug below */
|
|
|
- (void *)0x1
|
|
|
#undef FLAG
|
|
|
};
|
|
|
|
|
@@ -148,7 +145,7 @@ static ssize_t hwflags_read(struct file *file, char __user *user_buf,
|
|
|
/* fail compilation if somebody adds or removes
|
|
|
* a flag without updating the name array above
|
|
|
*/
|
|
|
- BUILD_BUG_ON(hw_flag_names[NUM_IEEE80211_HW_FLAGS] != (void *)0x1);
|
|
|
+ BUILD_BUG_ON(ARRAY_SIZE(hw_flag_names) != NUM_IEEE80211_HW_FLAGS);
|
|
|
|
|
|
for (i = 0; i < NUM_IEEE80211_HW_FLAGS; i++) {
|
|
|
if (test_bit(i, local->hw.flags))
|