Commit eca02655 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: mt7615: fix hw_scan with ssid_type for specified SSID only 



Fix hw_scan with ssid_type for specified SSID only

The definition for ssid_type in current firmware is that
ssid_type BIT(2) set actually for specified SSID + wildcard SSID.
ssid_type BIT(2) and ssid_type_ext BIT(0) both set actually for
specified SSID only;

Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 6f4bd852

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+1 −0
Original line number Diff line number Diff line
@@ -2898,6 +2898,7 @@ int mt7615_mcu_hw_scan(struct mt7615_phy *phy, struct ieee80211_vif *vif, 
		n_ssids++;

	}

	req->ssid_type = n_ssids ? BIT(2) : BIT(0);

	req->ssid_type_ext = n_ssids ? BIT(0) : 0;

	req->ssids_num = n_ssids;



	/* increase channel time for passive scan */

drivers/net/wireless/mediatek/mt76/mt7615/mcu.h

+4 −2
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ struct mt7615_hw_scan_req { 
		       */

	u8 ssid_type; /* BIT(0) wildcard SSID

		       * BIT(1) P2P wildcard SSID

		       * BIT(2) specified SSID

		       * BIT(2) specified SSID + wildcard SSID

		       * BIT(2) + ssid_type_ext BIT(0) specified SSID only

		       */

	u8 ssids_num;

	u8 probe_req_num; /* Number of probe request for each SSID */
@@ -362,7 +363,8 @@ struct mt7615_hw_scan_req { 
	struct mt7615_mcu_scan_ssid ext_ssids[6];

	u8 bssid[ETH_ALEN];

	u8 random_mac[ETH_ALEN]; /* valid when BIT(1) in scan_func is set. */

	u8 pad[64];

	u8 pad[63];

	u8 ssid_type_ext;

} __packed;



#define SCAN_DONE_EVENT_MAX_CHANNEL_NUM	64

CRA Git | Maintained and supported by SUSTech CRA and CCSE