Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cec0fc18 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wil6210: pass is_go flag to firmware"

parents 0239cce5 e037e9a4

drivers/net/wireless/ath/wil6210/cfg80211.c

+8 −1
Original line number Diff line number Diff line
@@ -1054,10 +1054,17 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy, 
	int rc;

	struct wireless_dev *wdev = ndev->ieee80211_ptr;

	u8 wmi_nettype = wil_iftype_nl2wmi(wdev->iftype);

	u8 is_go = (wdev->iftype == NL80211_IFTYPE_P2P_GO);



	if (pbss)

		wmi_nettype = WMI_NETTYPE_P2P;



	wil_dbg_misc(wil, "%s: is_go=%d\n", __func__, is_go);

	if (is_go && !pbss) {

		wil_err(wil, "%s: P2P GO must be in PBSS\n", __func__);

		return -ENOTSUPP;

	}



	wil_set_recovery_state(wil, fw_recovery_idle);



	mutex_lock(&wil->mutex);
@@ -1082,7 +1089,7 @@ static int _wil_cfg80211_start_ap(struct wiphy *wiphy, 


	netif_carrier_on(ndev);



	rc = wmi_pcp_start(wil, bi, wmi_nettype, chan, hidden_ssid);

	rc = wmi_pcp_start(wil, bi, wmi_nettype, chan, hidden_ssid, is_go);

	if (rc)

		goto err_pcp_start;

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ void wil_p2p_wdev_free(struct wil6210_priv *wil); 


int wmi_set_mac_address(struct wil6210_priv *wil, void *addr);

int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype,

		  u8 chan, u8 hidden_ssid);

		  u8 chan, u8 hidden_ssid, u8 is_go);

int wmi_pcp_stop(struct wil6210_priv *wil);

void wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid,

			u16 reason_code, bool from_event);

drivers/net/wireless/ath/wil6210/wmi.c

+2 −1
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ int wmi_set_mac_address(struct wil6210_priv *wil, void *addr) 
}



int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype,

		  u8 chan, u8 hidden_ssid)

		  u8 chan, u8 hidden_ssid, u8 is_go)

{

	int rc;
@@ -974,6 +974,7 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, 
		.channel = chan - 1,

		.pcp_max_assoc_sta = max_assoc_sta,

		.hidden_ssid = hidden_ssid,

		.is_go = is_go,

	};

	struct {

		struct wmi_cmd_hdr wmi;