Message ID | 20160920220030.10257-1-zajec5@gmail.com (mailing list archive) |
---|---|
State | RFC |
Delegated to: | Kalle Valo |
Headers | show |
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index 201a980..1791060 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -471,11 +471,14 @@ send_key_to_dongle(struct brcmf_if *ifp, struct brcmf_wsec_key *key) convert_key_from_CPU(key, &key_le); + netif_stop_queue(ifp->ndev); brcmf_netdev_wait_pend8021x(ifp); err = brcmf_fil_bsscfg_data_set(ifp, "wsec_key", &key_le, sizeof(key_le)); + netif_start_queue(ifp->ndev); + if (err) brcmf_err("wsec_key error (%d)\n", err); return err;
From: Rafał Miłecki <rafal@milecki.pl> Sending a new key to the firmware should be done without any 802.1x packets pending. Currently brcmfmac has very trivial code waiting for that condition and it doesn't seem to be enough. We should stop netif from sending any extra packets in order to: 1) Make sure new 802.1x packets won't be coming over and over 2) Avoid a race with netif providing a new packet right after our waiting code Another solution would be to accept only non-802.1x packets. This would require enqueuing all packets and hacking brcmf_fws_dequeue_worker to dequeue only non-802.1x ones but that would most likely result in too hacky code. --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++ 1 file changed, 3 insertions(+)