Skip to content

Commit

Permalink
use nl80211_band instead of ieee80211_band
Browse files Browse the repository at this point in the history
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
nbd168 committed May 14, 2016
1 parent 13c2922 commit e4c05ba
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions mt76x2_eeprom.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion mt76x2_eeprom.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mt76x2_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions mt76x2_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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] = {
Expand Down

0 comments on commit e4c05ba

Please sign in to comment.