From e4c05ba1624d440c2b7efde2971eb360e37a7b23 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 14 May 2016 16:51:44 +0200 Subject: [PATCH] use nl80211_band instead of ieee80211_band Signed-off-by: Felix Fietkau --- mt76x2_eeprom.c | 4 ++-- mt76x2_eeprom.h | 2 +- mt76x2_mac.c | 2 +- mt76x2_phy.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mt76x2_eeprom.c b/mt76x2_eeprom.c index 3e8f4827..e636dae7 100644 --- a/mt76x2_eeprom.c +++ b/mt76x2_eeprom.c @@ -568,7 +568,7 @@ void mt76x2_get_power_info(struct mt76x2_dev *dev, struct mt76x2_tx_power_info * int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t) { - enum ieee80211_band band = dev->chandef.chan->band; + enum nl80211_band band = dev->chandef.chan->band; u16 val, slope; u8 bounds; @@ -602,7 +602,7 @@ int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t) return 0; } -bool mt76x2_ext_pa_enabled(struct mt76x2_dev *dev, enum ieee80211_band band) +bool mt76x2_ext_pa_enabled(struct mt76x2_dev *dev, enum nl80211_band band) { u16 conf1 = mt76x2_eeprom_get(dev, MT_EE_NIC_CONF_0); diff --git a/mt76x2_eeprom.h b/mt76x2_eeprom.h index b75cee35..e6abf8fc 100644 --- a/mt76x2_eeprom.h +++ b/mt76x2_eeprom.h @@ -146,7 +146,7 @@ mt76x2_eeprom_get(struct mt76x2_dev *dev, enum mt76x2_eeprom_field field) void mt76x2_get_rate_power(struct mt76x2_dev *dev, struct mt76x2_rate_power *t); void mt76x2_get_power_info(struct mt76x2_dev *dev, struct mt76x2_tx_power_info *t); int mt76x2_get_temp_comp(struct mt76x2_dev *dev, struct mt76x2_temp_comp *t); -bool mt76x2_ext_pa_enabled(struct mt76x2_dev *dev, enum ieee80211_band band); +bool mt76x2_ext_pa_enabled(struct mt76x2_dev *dev, enum nl80211_band band); void mt76x2_read_rx_gain(struct mt76x2_dev *dev); static inline bool diff --git a/mt76x2_mac.c b/mt76x2_mac.c index 1715309c..02790063 100644 --- a/mt76x2_mac.c +++ b/mt76x2_mac.c @@ -247,7 +247,7 @@ int mt76x2_mac_process_rx(struct mt76x2_dev *dev, struct sk_buff *skb, void *rxi static void mt76x2_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate, - enum ieee80211_band band) + enum nl80211_band band) { u8 idx = MT76_GET(MT_RXWI_RATE_INDEX, rate); diff --git a/mt76x2_phy.c b/mt76x2_phy.c index a27fc126..59e54f36 100644 --- a/mt76x2_phy.c +++ b/mt76x2_phy.c @@ -235,7 +235,7 @@ mt76x2_phy_channel_calibrate(struct mt76x2_dev *dev, bool mac_stopped) } static void -mt76x2_phy_set_txpower_regs(struct mt76x2_dev *dev, enum ieee80211_band band) +mt76x2_phy_set_txpower_regs(struct mt76x2_dev *dev, enum nl80211_band band) { u32 pa_mode[2]; u32 pa_mode_adj; @@ -296,7 +296,7 @@ mt76x2_phy_set_txpower_regs(struct mt76x2_dev *dev, enum ieee80211_band band) } static void -mt76x2_configure_tx_delay(struct mt76x2_dev *dev, enum ieee80211_band band, u8 bw) +mt76x2_configure_tx_delay(struct mt76x2_dev *dev, enum nl80211_band band, u8 bw) { u32 cfg0, cfg1; @@ -456,7 +456,7 @@ int mt76x2_phy_set_channel(struct mt76x2_dev *dev, { struct ieee80211_channel *chan = chandef->chan; bool scan = test_bit(MT76_SCANNING, &dev->mt76.state); - enum ieee80211_band band = chan->band; + enum nl80211_band band = chan->band; u8 channel; u32 ext_cca_chan[4] = {