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

Commit c5745187 authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Luciano Coelho
Browse files

wl12xx: fix roaming 



The wl12xx device normally drops all frames coming from BSSID
it is not joined with.

This behavior is configured today by the wl12xx driver in response
to a handful of ieee80211_bss_change and ieee80211_conf_changed
notification flags, such as BSS_CHANGED_ASSOC, BSS_CHANGED_BSSID,
IEEE80211_CONF_CHANGE_IDLE, etc..

This breaks when we roam to a new BSSID, where authentication frames
are sent before any BSS_CHANGED/CONF_CHANGED flags are received.
When this happens the hardware silently drops the authentication
responses, and the roaming fails.

Ideally this aggressive filtering behavior of the device should be disabled
upon a notification from mac80211. Such notification will take place
after multi-channel support will be added: mac80211 will likely send a
remain-on-channel notification to drivers when entering sensitive
states (like authentication), otherwise the firmware might jump to
different channels (to serve a different role).

Until those notifications materialize, disable the hw BSSID filter
when authentication requests are sent, so roaming would work.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Reviewed-by: default avatarLuciano Coelho <coelho@ti.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 13026dec

drivers/net/wireless/wl12xx/io.h

+1 −0
Original line number Diff line number Diff line
@@ -171,5 +171,6 @@ int wl1271_free_hw(struct wl1271 *wl); 
irqreturn_t wl1271_irq(int irq, void *data);

bool wl1271_set_block_size(struct wl1271 *wl);

int wl1271_tx_dummy_packet(struct wl1271 *wl);

void wl1271_configure_filters(struct wl1271 *wl, unsigned int filters);



#endif

drivers/net/wireless/wl12xx/main.c

+2 −2
Original line number Diff line number Diff line
@@ -1528,7 +1528,7 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw, 
	cancel_work_sync(&wl->recovery_work);

}



static void wl1271_configure_filters(struct wl1271 *wl, unsigned int filters)

void wl1271_configure_filters(struct wl1271 *wl, unsigned int filters)

{

	wl1271_set_default_filters(wl);
@@ -1650,7 +1650,7 @@ static int wl1271_unjoin(struct wl1271 *wl) 
	clear_bit(WL1271_FLAG_JOINED, &wl->flags);

	memset(wl->bssid, 0, ETH_ALEN);



	/* stop filterting packets based on bssid */

	/* stop filtering packets based on bssid */

	wl1271_configure_filters(wl, FIF_OTHER_BSS);



out:

drivers/net/wireless/wl12xx/tx.c

+24 −0
Original line number Diff line number Diff line
@@ -70,6 +70,28 @@ static void wl1271_free_tx_id(struct wl1271 *wl, int id) 
	}

}



static int wl1271_tx_update_filters(struct wl1271 *wl,

						 struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr;



	hdr = (struct ieee80211_hdr *)(skb->data +

				       sizeof(struct wl1271_tx_hw_descr));



	/*

	 * stop bssid-based filtering before transmitting authentication

	 * requests. this way the hw will never drop authentication

	 * responses coming from BSSIDs it isn't familiar with (e.g. on

	 * roaming)

	 */

	if (!ieee80211_is_auth(hdr->frame_control))

		return 0;



	wl1271_configure_filters(wl, FIF_OTHER_BSS);



	return wl1271_acx_rx_config(wl, wl->rx_config, wl->rx_filter);

}



static void wl1271_tx_ap_update_inconnection_sta(struct wl1271 *wl,

						 struct sk_buff *skb)

{
@@ -350,6 +372,8 @@ static int wl1271_prepare_tx_frame(struct wl1271 *wl, struct sk_buff *skb, 
	if (wl->bss_type == BSS_TYPE_AP_BSS) {

		wl1271_tx_ap_update_inconnection_sta(wl, skb);

		wl1271_tx_regulate_link(wl, hlid);

	} else {

		wl1271_tx_update_filters(wl, skb);

	}



	wl1271_tx_fill_hdr(wl, skb, extra, info, hlid);