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

Commit 60e84c2e authored by Juuso Oikarinen's avatar Juuso Oikarinen Committed by John W. Linville
Browse files

wl1271: Update beacon interval properly for ad-hoc 



Configure the hardware beacon interval to whatever requested by the
mac80211.

Signed-off-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: default avatarTeemu Paasikivi <ext-teemu.3.paasikivi@nokia.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5da11dcd

drivers/net/wireless/wl12xx/wl1271.h

+3 −0
Original line number Diff line number Diff line
@@ -452,6 +452,9 @@ struct wl1271 { 
	/* The current band */

	enum ieee80211_band band;



	/* Beaconing interval (needed for ad-hoc) */

	u32 beacon_int;



	/* Default key (for WEP) */

	u32 default_key;

drivers/net/wireless/wl12xx/wl1271_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type) 
						   CONF_HW_BIT_RATE_24MBPS);

	}



	join->beacon_interval = cpu_to_le16(WL1271_DEFAULT_BEACON_INT);

	join->beacon_interval = cpu_to_le16(wl->beacon_int);

	join->dtim_interval = WL1271_DEFAULT_DTIM_PERIOD;



	join->channel = wl->channel;

drivers/net/wireless/wl12xx/wl1271_main.c

+10 −0
Original line number Diff line number Diff line
@@ -1575,6 +1575,15 @@ static void wl1271_op_bss_info_changed(struct ieee80211_hw *hw, 
	if (ret < 0)

		goto out;



	if ((changed && BSS_CHANGED_BEACON_INT) &&

	    (wl->bss_type == BSS_TYPE_IBSS)) {

		wl1271_debug(DEBUG_ADHOC, "ad-hoc beacon interval updated: %d",

			bss_conf->beacon_int);



		wl->beacon_int = bss_conf->beacon_int;

		do_join = true;

	}



	if ((changed && BSS_CHANGED_BEACON) &&

	    (wl->bss_type == BSS_TYPE_IBSS)) {

		struct sk_buff *beacon = ieee80211_beacon_get(hw, vif);
@@ -2193,6 +2202,7 @@ struct ieee80211_hw *wl1271_alloc_hw(void) 


	INIT_DELAYED_WORK(&wl->elp_work, wl1271_elp_work);

	wl->channel = WL1271_DEFAULT_CHANNEL;

	wl->beacon_int = WL1271_DEFAULT_BEACON_INT;

	wl->default_key = 0;

	wl->rx_counter = 0;

	wl->rx_config = WL1271_DEFAULT_RX_CONFIG;