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

Commit bddb29b8 authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wl12xx: move probereq into wlvif 



move probereq into the per-interface data, rather than
being global.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 1fe9f161

drivers/net/wireless/wl12xx/main.c

+6 −5
Original line number Diff line number Diff line
@@ -3525,11 +3525,12 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, 
			/*

			 * Get a template for hardware connection maintenance

			 */

			dev_kfree_skb(wl->probereq);

			wl->probereq = wl1271_cmd_build_ap_probe_req(wl, NULL);

			dev_kfree_skb(wlvif->probereq);

			wlvif->probereq = wl1271_cmd_build_ap_probe_req(wl,

									NULL);

			ieoffset = offsetof(struct ieee80211_mgmt,

					    u.probe_req.variable);

			wl1271_ssid_set(vif, wl->probereq, ieoffset);

			wl1271_ssid_set(vif, wlvif->probereq, ieoffset);



			/* enable the connection monitoring feature */

			ret = wl1271_acx_conn_monit_params(wl, true);
@@ -3546,8 +3547,8 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, 
			wl->aid = 0;



			/* free probe-request template */

			dev_kfree_skb(wl->probereq);

			wl->probereq = NULL;

			dev_kfree_skb(wlvif->probereq);

			wlvif->probereq = NULL;



			/* re-enable dynamic ps - just in case */

			ieee80211_enable_dyn_ps(wl->vif);

drivers/net/wireless/wl12xx/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ void wl1271_scan_complete_work(struct work_struct *work) 


	if (test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags)) {

		/* restore hardware connection monitoring template */

		wl1271_cmd_build_ap_probe_req(wl, wl->probereq);

		wl1271_cmd_build_ap_probe_req(wl, wlvif->probereq);

	}



	/* return to ROC if needed */

drivers/net/wireless/wl12xx/wl12xx.h

+3 −3
Original line number Diff line number Diff line
@@ -507,9 +507,6 @@ struct wl1271 { 


	bool sched_scanning;



	/* probe-req template for the current AP */

	struct sk_buff *probereq;



	/* Our association ID */

	u16 aid;
@@ -641,6 +638,9 @@ struct wl12xx_vif { 
	 */

	u32 basic_rate;

	u32 rate_set;



	/* probe-req template for the current AP */

	struct sk_buff *probereq;

};



static inline struct wl12xx_vif *wl12xx_vif_to_data(struct ieee80211_vif *vif)