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

Commit 0535d9f4 authored by Luciano Coelho's avatar Luciano Coelho Committed by John W. Linville
Browse files

wl1271: use acx_rx_config instead of join when updating filters 



We shouldn't use a join command to change the filter settings while
associated.  The right way to do it is to use ACX_RX_CFG.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8bcfcb12

drivers/net/wireless/wl12xx/wl1271_main.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -422,7 +422,7 @@ static void wl1271_filter_work(struct work_struct *work) 
		goto out;

		goto out;





	/* apply configured filters */

	/* apply configured filters */

	ret = wl1271_cmd_join(wl);

	ret = wl1271_acx_rx_config(wl, wl->rx_config, wl->rx_filter);

	if (ret < 0)

	if (ret < 0)

		goto out_sleep;

		goto out_sleep;
@@ -869,6 +869,8 @@ static u64 wl1271_op_prepare_multicast(struct ieee80211_hw *hw, int mc_count, 
			wl1271_warning("Unknown mc address length.");

			wl1271_warning("Unknown mc address length.");

	}

	}





	/* FIXME: We still need to set our filters properly */



	spin_lock_irqsave(&wl->wl_lock, flags);

	spin_lock_irqsave(&wl->wl_lock, flags);

	kfree(wl->filter_params);

	kfree(wl->filter_params);

	wl->filter_params = fp;

	wl->filter_params = fp;