gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: mt7615: remove useless MT_HW_RDD0/1 enum

Browse Source 
Writing 0/1 is shorter and just as clear

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2019-12-03 20:04:12 +01:00
parent bdcd45dd04
commit 0954c37d01
3 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt7615/init.c
+1 -2
View File
@@ -263,8 +263,7 @@ mt7615_regd_notifier(struct wiphy *wiphy,
mt7615_dfs_stop_radar_detector(dev); mt7615_dfs_stop_radar_detector(dev);
if (request->dfs_region == NL80211_DFS_UNSET) if (request->dfs_region == NL80211_DFS_UNSET)
mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, MT_HW_RDD0, mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, 0, MT_RX_SEL0, 0);
MT_RX_SEL0, 0);
else else
mt7615_dfs_start_radar_detector(dev); mt7615_dfs_start_radar_detector(dev);
} }
mt7615/mac.c
+12 -17
View File
@@ -1502,15 +1502,13 @@ int mt7615_dfs_stop_radar_detector(struct mt7615_dev *dev)
struct cfg80211_chan_def *chandef = &dev->mphy.chandef; struct cfg80211_chan_def *chandef = &dev->mphy.chandef;
int err; int err;
err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, MT_HW_RDD0, err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, 0, MT_RX_SEL0, 0);
MT_RX_SEL0, 0);
if (err < 0) if (err < 0)
return err; return err;
if (chandef->width == NL80211_CHAN_WIDTH_160 || if (chandef->width == NL80211_CHAN_WIDTH_160 ||
chandef->width == NL80211_CHAN_WIDTH_80P80) chandef->width == NL80211_CHAN_WIDTH_80P80)
err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, MT_HW_RDD1, err = mt7615_mcu_rdd_cmd(dev, RDD_STOP, 1, MT_RX_SEL0, 0);
MT_RX_SEL0, 0);
return err; return err;
} }
@@ -1532,20 +1530,19 @@ int mt7615_dfs_start_radar_detector(struct mt7615_dev *dev)
int err; int err;
/* start CAC */ /* start CAC */
err = mt7615_mcu_rdd_cmd(dev, RDD_CAC_START, MT_HW_RDD0, err = mt7615_mcu_rdd_cmd(dev, RDD_CAC_START, 0, MT_RX_SEL0, 0);
MT_RX_SEL0, 0);
if (err < 0) if (err < 0)
return err; return err;
/* TODO: DBDC support */ /* TODO: DBDC support */
err = mt7615_dfs_start_rdd(dev, MT_HW_RDD0); err = mt7615_dfs_start_rdd(dev, 0);
if (err < 0) if (err < 0)
return err; return err;
if (chandef->width == NL80211_CHAN_WIDTH_160 || if (chandef->width == NL80211_CHAN_WIDTH_160 ||
chandef->width == NL80211_CHAN_WIDTH_80P80) { chandef->width == NL80211_CHAN_WIDTH_80P80) {
err = mt7615_dfs_start_rdd(dev, MT_HW_RDD1); err = mt7615_dfs_start_rdd(dev, 1);
if (err < 0) if (err < 0)
return err; return err;
} }
@@ -1572,15 +1569,13 @@ int mt7615_dfs_init_radar_detector(struct mt7615_dev *dev)
if (chandef->chan->flags & IEEE80211_CHAN_RADAR) { if (chandef->chan->flags & IEEE80211_CHAN_RADAR) {
if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE) if (chandef->chan->dfs_state != NL80211_DFS_AVAILABLE)
return mt7615_dfs_start_radar_detector(dev); return mt7615_dfs_start_radar_detector(dev);
else
return mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, MT_HW_RDD0,
MT_RX_SEL0, 0);
} else {
err = mt7615_mcu_rdd_cmd(dev, RDD_NORMAL_START,
MT_HW_RDD0, MT_RX_SEL0, 0);
if (err < 0)
return err;
return mt7615_dfs_stop_radar_detector(dev); return mt7615_mcu_rdd_cmd(dev, RDD_CAC_END, 0, MT_RX_SEL0, 0);
} }
err = mt7615_mcu_rdd_cmd(dev, RDD_NORMAL_START, 0, MT_RX_SEL0, 0);
if (err < 0)
return err;
return mt7615_dfs_stop_radar_detector(dev);
} }
mt7615/mt7615.h
-5
View File
@@ -149,11 +149,6 @@ enum {
EXT_BSSID_END EXT_BSSID_END
}; };
enum {
MT_HW_RDD0,
MT_HW_RDD1,
};
enum { enum {
MT_RX_SEL0, MT_RX_SEL0,
MT_RX_SEL1, MT_RX_SEL1,