xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mt76: mt7615: do not perform txcalibration before cac is complited

Browse Source 
Delay channel calibration after Channel Availability Check. Add some
code cleanup to mt7615_mcu_set_channel

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi
2019-06-29 12:36:08 +02:00
committed by Felix Fietkau
parent d67a66469f
commit 02fc62e374
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
View File

@@ -1280,7 +1280,8 @@ int mt7615_mcu_rdd_cmd(struct mt7615_dev *dev,
int mt7615_mcu_set_channel(struct mt7615_dev *dev) int mt7615_mcu_set_channel(struct mt7615_dev *dev)
{ {
struct cfg80211_chan_def *chdef = &dev->mt76.chandef; struct cfg80211_chan_def *chandef = &dev->mt76.chandef;
int freq1 = chandef->center_freq1, freq2 = chandef->center_freq2;
struct { struct {
u8 control_chan; u8 control_chan;
u8 center_chan; u8 center_chan;
@@ -1299,17 +1300,20 @@ int mt7615_mcu_set_channel(struct mt7615_dev *dev)
u8 rsv1[3]; u8 rsv1[3];
u8 txpower_sku[53]; u8 txpower_sku[53];
u8 rsv2[3]; u8 rsv2[3];
} req = {0}; } req = {
.control_chan = chandef->chan->hw_value,
.center_chan = ieee80211_frequency_to_channel(freq1),
.tx_streams = (dev->mt76.chainmask >> 8) & 0xf,
.rx_streams_mask = dev->mt76.antenna_mask,
.center_chan2 = ieee80211_frequency_to_channel(freq2),
};
int ret; int ret;
req.control_chan = chdef->chan->hw_value; if ((chandef->chan->flags & IEEE80211_CHAN_RADAR) &&
req.center_chan = ieee80211_frequency_to_channel(chdef->center_freq1); chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
req.tx_streams = (dev->mt76.chainmask >> 8) & 0xf; req.switch_reason = CH_SWITCH_DFS;
req.rx_streams_mask = dev->mt76.antenna_mask; else
req.switch_reason = CH_SWITCH_NORMAL; req.switch_reason = CH_SWITCH_NORMAL;
req.band_idx = 0;
req.center_chan2 = ieee80211_frequency_to_channel(chdef->center_freq2);
req.txpower_drop = 0;
switch (dev->mt76.chandef.width) { switch (dev->mt76.chandef.width) {
case NL80211_CHAN_WIDTH_40: case NL80211_CHAN_WIDTH_40:
@@ -1334,6 +1338,7 @@ int mt7615_mcu_set_channel(struct mt7615_dev *dev)
case NL80211_CHAN_WIDTH_20: case NL80211_CHAN_WIDTH_20:
default: default:
req.bw = CMD_CBW_20MHZ; req.bw = CMD_CBW_20MHZ;
break;
} }
memset(req.txpower_sku, 0x3f, 49); memset(req.txpower_sku, 0x3f, 49);