diff options
author | David S. Miller <davem@davemloft.net> | 2016-04-13 17:58:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-13 17:58:51 -0400 |
commit | 71bbe25d01fa4f35551ff7bffc3e03ddd3e960cd (patch) | |
tree | d32c77e506192ef0ba62a10e92aac410eccaa575 /drivers/net/wireless/ath/wcn36xx/txrx.c | |
parent | tipc: remove remnants of old broadcast code (diff) | |
parent | cfg80211: remove enum ieee80211_band (diff) | |
download | linux-dev-71bbe25d01fa4f35551ff7bffc3e03ddd3e960cd.tar.xz linux-dev-71bbe25d01fa4f35551ff7bffc3e03ddd3e960cd.zip |
Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
To synchronize with Kalle, here's just a big change that affects
all drivers - removing the duplicated enum ieee80211_band and
replacing it by enum nl80211_band. On top of that, just a small
documentation update.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/wcn36xx/txrx.c')
-rw-r--r-- | drivers/net/wireless/ath/wcn36xx/txrx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/wcn36xx/txrx.c b/drivers/net/wireless/ath/wcn36xx/txrx.c index 99c21aac68bd..6c47a7336c38 100644 --- a/drivers/net/wireless/ath/wcn36xx/txrx.c +++ b/drivers/net/wireless/ath/wcn36xx/txrx.c @@ -225,7 +225,7 @@ static void wcn36xx_set_tx_mgmt(struct wcn36xx_tx_bd *bd, /* default rate for unicast */ if (ieee80211_is_mgmt(hdr->frame_control)) - bd->bd_rate = (WCN36XX_BAND(wcn) == IEEE80211_BAND_5GHZ) ? + bd->bd_rate = (WCN36XX_BAND(wcn) == NL80211_BAND_5GHZ) ? WCN36XX_BD_RATE_CTRL : WCN36XX_BD_RATE_MGMT; else if (ieee80211_is_ctl(hdr->frame_control)) |