mirror of
https://github.com/outbackdingo/mt76.git
synced 2026-10-24 13:26:48 +00:00
wifi: mt76: mt7925: drop unused NAN 2.4/5 GHz support config
The config_support_5g/support_5g_val and config_2dot4g_support/
support_2dot4g_val fields in the NAN enable request are not used by the
firmware, so stop setting them and drop mt7925_nan_set_2g_support().
Fixes: 0f3605e4f8de ("wifi: mt76: mt7925: wire up NAN operations")
Co-developed-by: Sean Wang <[email protected]>
Signed-off-by: Sean Wang <[email protected]>
Signed-off-by: Stella Liu <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
committed by
Felix Fietkau
parent
984def9943
commit
dca87ee6fd
@@ -32,8 +32,6 @@ static void mt7925_nan_set_5g_channel(struct mt792x_dev *dev,
|
|||||||
if (!mt7925_regd_is_valid_channel(dev, NL80211_BAND_5GHZ, chan))
|
if (!mt7925_regd_is_valid_channel(dev, NL80211_BAND_5GHZ, chan))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
req->config_support_5g = 1;
|
|
||||||
req->support_5g_val = 1;
|
|
||||||
req->config_5g_channel = 1;
|
req->config_5g_channel = 1;
|
||||||
|
|
||||||
if (chan->hw_value == NAN_5G_LOW_DISC_CHANNEL)
|
if (chan->hw_value == NAN_5G_LOW_DISC_CHANNEL)
|
||||||
@@ -44,16 +42,6 @@ static void mt7925_nan_set_5g_channel(struct mt792x_dev *dev,
|
|||||||
req->channel_5g_val = cpu_to_le32(ch5g);
|
req->channel_5g_val = cpu_to_le32(ch5g);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mt7925_nan_set_2g_support(struct mt7925_nan_enable_req_tlv *req,
|
|
||||||
struct cfg80211_nan_conf *conf)
|
|
||||||
{
|
|
||||||
if (!conf->band_cfgs[NL80211_BAND_2GHZ].chan)
|
|
||||||
return;
|
|
||||||
|
|
||||||
req->config_2dot4g_support = 1;
|
|
||||||
req->support_2dot4g_val = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void mt7925_nan_set_cluster_id(struct mt7925_nan_enable_req_tlv *req,
|
static void mt7925_nan_set_cluster_id(struct mt7925_nan_enable_req_tlv *req,
|
||||||
const u8 *cluster_id)
|
const u8 *cluster_id)
|
||||||
{
|
{
|
||||||
@@ -172,7 +160,6 @@ int mt7925_nan_enable(struct ieee80211_vif *vif,
|
|||||||
|
|
||||||
p_nan_req_tlv->master_pref = conf->master_pref;
|
p_nan_req_tlv->master_pref = conf->master_pref;
|
||||||
|
|
||||||
mt7925_nan_set_2g_support(p_nan_req_tlv, conf);
|
|
||||||
mt7925_nan_set_5g_channel(dev, p_nan_req_tlv, conf);
|
mt7925_nan_set_5g_channel(dev, p_nan_req_tlv, conf);
|
||||||
mt7925_nan_set_cluster_id(p_nan_req_tlv, conf->cluster_id);
|
mt7925_nan_set_cluster_id(p_nan_req_tlv, conf->cluster_id);
|
||||||
mt7925_nan_set_dw_interval(p_nan_req_tlv, conf);
|
mt7925_nan_set_dw_interval(p_nan_req_tlv, conf);
|
||||||
|
|||||||
Reference in New Issue
Block a user