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

Commit 8bf29b0e authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Fix ad-hoc SSID update 



If re-configuring the SSID while ad-hoc was already enabled, the beacon
template would be properly updated, but the SSID passed in the CMD_JOIN would
not - hence filtering etc would not work properly.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarKalle Valo <kalle.valo@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ee444cf0

drivers/net/wireless/wl12xx/wl1271_main.c

+16 −7
Original line number Diff line number Diff line 
/*

 * This file is part of wl1271

 *

 * Copyright (C) 2008-2009 Nokia Corporation

 * Copyright (C) 2008-2010 Nokia Corporation

 *

 * Contact: Luciano Coelho <luciano.coelho@nokia.com>

 *
@@ -1604,6 +1604,7 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, 
{

	enum wl1271_cmd_ps_mode mode;

	struct wl1271 *wl = hw->priv;

	bool do_join = false;

	int ret;



	wl1271_debug(DEBUG_MAC80211, "mac80211 bss info changed");
@@ -1646,6 +1647,9 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, 
			dev_kfree_skb(beacon);

			if (ret < 0)

				goto out_sleep;



			/* Need to update the SSID (for filtering etc) */

			do_join = true;

		}

	}
@@ -1664,12 +1668,8 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, 
				goto out_sleep;

			}



			ret = wl1271_cmd_join(wl);

			if (ret < 0) {

				wl1271_warning("cmd join failed %d", ret);

				goto out_sleep;

			}

			set_bit(WL1271_FLAG_JOINED, &wl->flags);

			/* Need to update the BSSID (for filtering etc) */

			do_join = true;

	}



	if (changed & BSS_CHANGED_ASSOC) {
@@ -1736,6 +1736,15 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, 
		}

	}



	if (do_join) {

		ret = wl1271_cmd_join(wl);

		if (ret < 0) {

			wl1271_warning("cmd join failed %d", ret);

			goto out_sleep;

		}

		set_bit(WL1271_FLAG_JOINED, &wl->flags);

	}



out_sleep:

	wl1271_ps_elp_sleep(wl);