diff options
| author | Daniel Wagner <wagi@monom.org> | 2018-01-19 15:47:25 +0100 |
|---|---|---|
| committer | Daniel Wagner <wagi@monom.org> | 2018-01-19 15:47:25 +0100 |
| commit | b40d8d81c4f41bf37b36e16451b1cabca763a02b (patch) | |
| tree | 227967192ee954d679ab23849fb2444dfae75dc1 /net/mac80211 | |
| parent | 89406ab85218d39dc483f81ded1dfb91b0b28aa7 (diff) | |
| parent | 42375c1120d5c90d7469ba264fb124f728b1a4f7 (diff) | |
| download | linux-rt-b40d8d81c4f41bf37b36e16451b1cabca763a02b.tar.gz | |
Merge tag 'v4.4.112' into v4.4-rt
This is the 4.4.112 stable release
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/debugfs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 4d2aaebd4f97..e546a987a9d3 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -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), @@ -125,9 +125,6 @@ static const char *hw_flag_names[NUM_IEEE80211_HW_FLAGS + 1] = { FLAG(TDLS_WIDER_BW), FLAG(SUPPORTS_AMSDU_IN_AMPDU), FLAG(BEACON_TX_STATUS), - - /* keep last for the build bug below */ - (void *)0x1 #undef FLAG }; @@ -147,7 +144,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)) |