Commit c5e96c91 authored by Dedy Lansky's avatar Dedy Lansky Committed by Kalle Valo
Browse files

wil6210: fix timing of netif_carrier_on indication 



netif_carrier_on indication was too late. In case Rx packet received
before netif_carrier_on indication, upper layers could not send
Tx packet back.

The fix is to indicate netif_carrier_on earlier:
for STA, indicate netif_carrier_on when association starts.
for AP/PCP, indicate netif_carrier_on upon starting AP/PCP.

Signed-off-by: default avatarDedy Lansky <qca_dlansky@qca.qualcomm.com>
Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 8c679675

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

+5 −3
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy, 


	rc = wmi_send(wil, WMI_CONNECT_CMDID, &conn, sizeof(conn));

	if (rc == 0) {

		netif_carrier_on(ndev);

		/* Connect can take lots of time */

		mod_timer(&wil->connect_timer,

			  jiffies + msecs_to_jiffies(2000));
@@ -757,12 +758,12 @@ static int wil_cfg80211_start_ap(struct wiphy *wiphy, 


	wil->secure_pcp = info->privacy;



	netif_carrier_on(ndev);



	rc = wmi_pcp_start(wil, info->beacon_interval, wmi_nettype,

			   channel->hw_value);

	if (rc)

		goto out;



	netif_carrier_on(ndev);

		netif_carrier_off(ndev);



out:

	mutex_unlock(&wil->mutex);
@@ -777,6 +778,7 @@ static int wil_cfg80211_stop_ap(struct wiphy *wiphy, 


	wil_dbg_misc(wil, "%s()\n", __func__);



	netif_carrier_off(ndev);

	wil_set_recovery_state(wil, fw_recovery_idle);



	mutex_lock(&wil->mutex);

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

+6 −24
Original line number Diff line number Diff line
@@ -248,7 +248,9 @@ static void _wil6210_disconnect(struct wil6210_priv *wil, const u8 *bssid, 
	switch (wdev->iftype) {

	case NL80211_IFTYPE_STATION:

	case NL80211_IFTYPE_P2P_CLIENT:

		wil_link_off(wil);

		netif_tx_stop_all_queues(ndev);

		netif_carrier_off(ndev);



		if (test_bit(wil_status_fwconnected, wil->status)) {

			clear_bit(wil_status_fwconnected, wil->status);

			cfg80211_disconnected(ndev, reason_code,
@@ -395,6 +397,8 @@ static void wil_connect_worker(struct work_struct *work) 
	int rc;

	struct wil6210_priv *wil = container_of(work, struct wil6210_priv,

						connect_worker);

	struct net_device *ndev = wil_to_ndev(wil);



	int cid = wil->pending_connect_cid;

	int ringid = wil_find_free_vring(wil);
@@ -409,7 +413,7 @@ static void wil_connect_worker(struct work_struct *work) 
	wil->pending_connect_cid = -1;

	if (rc == 0) {

		wil->sta[cid].status = wil_sta_connected;

		wil_link_on(wil);

		netif_tx_wake_all_queues(ndev);

	} else {

		wil->sta[cid].status = wil_sta_unused;

	}
@@ -741,28 +745,6 @@ void wil_fw_error_recovery(struct wil6210_priv *wil) 
	schedule_work(&wil->fw_error_worker);

}



void wil_link_on(struct wil6210_priv *wil)

{

	struct net_device *ndev = wil_to_ndev(wil);



	wil_dbg_misc(wil, "%s()\n", __func__);



	netif_carrier_on(ndev);

	wil_dbg_misc(wil, "netif_tx_wake : link on\n");

	netif_tx_wake_all_queues(ndev);

}



void wil_link_off(struct wil6210_priv *wil)

{

	struct net_device *ndev = wil_to_ndev(wil);



	wil_dbg_misc(wil, "%s()\n", __func__);



	netif_tx_stop_all_queues(ndev);

	wil_dbg_misc(wil, "netif_tx_stop : link off\n");

	netif_carrier_off(ndev);

}



int __wil_up(struct wil6210_priv *wil)

{

	struct net_device *ndev = wil_to_ndev(wil);

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

+1 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void *wil_if_alloc(struct device *dev, void __iomem *csr) 
	netif_napi_add(ndev, &wil->napi_tx, wil6210_netdev_poll_tx,

		       WIL6210_NAPI_BUDGET);



	wil_link_off(wil);

	netif_tx_stop_all_queues(ndev);



	return wil;
@@ -217,8 +217,6 @@ int wil_if_add(struct wil6210_priv *wil) 
		return rc;

	}



	wil_link_off(wil);



	return 0;

}

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

+0 −2
Original line number Diff line number Diff line
@@ -649,8 +649,6 @@ void wil_priv_deinit(struct wil6210_priv *wil); 
int wil_reset(struct wil6210_priv *wil);

void wil_fw_error_recovery(struct wil6210_priv *wil);

void wil_set_recovery_state(struct wil6210_priv *wil, int state);

void wil_link_on(struct wil6210_priv *wil);

void wil_link_off(struct wil6210_priv *wil);

int wil_up(struct wil6210_priv *wil);

int __wil_up(struct wil6210_priv *wil);

int wil_down(struct wil6210_priv *wil);

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

+0 −2
Original line number Diff line number Diff line
@@ -566,7 +566,6 @@ static void wil_addba_tx_cid(struct wil6210_priv *wil, u8 cid, u16 wsize) 


static void wmi_evt_linkup(struct wil6210_priv *wil, int id, void *d, int len)

{

	struct net_device *ndev = wil_to_ndev(wil);

	struct wmi_data_port_open_event *evt = d;

	u8 cid = evt->cid;
@@ -580,7 +579,6 @@ static void wmi_evt_linkup(struct wil6210_priv *wil, int id, void *d, int len) 
	wil->sta[cid].data_port_open = true;

	if (agg_wsize >= 0)

		wil_addba_tx_cid(wil, cid, agg_wsize);

	netif_carrier_on(ndev);

}



static void wmi_evt_linkdown(struct wil6210_priv *wil, int id, void *d, int len)

CRA Git | Maintained and supported by SUSTech CRA and CCSE