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

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

wl12xx: move aid into wlvif 



move aid 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 bddb29b8

drivers/net/wireless/wl12xx/main.c

+4 −4
Original line number Diff line number Diff line
@@ -2217,7 +2217,7 @@ static int wl1271_join(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
	if (ret < 0)

		goto out;



	ret = wl1271_acx_aid(wl, wl->aid);

	ret = wl1271_acx_aid(wl, wlvif->aid);

	if (ret < 0)

		goto out;
@@ -3487,7 +3487,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, 
		if (bss_conf->assoc) {

			u32 rates;

			int ieoffset;

			wl->aid = bss_conf->aid;

			wlvif->aid = bss_conf->aid;

			set_assoc = true;



			wl->ps_poll_failures = 0;
@@ -3518,7 +3518,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, 
			 * updates it by itself when the first beacon is

			 * received after a join.

			 */

			ret = wl1271_cmd_build_ps_poll(wl, wlvif, wl->aid);

			ret = wl1271_cmd_build_ps_poll(wl, wlvif, wlvif->aid);

			if (ret < 0)

				goto out;
@@ -3544,7 +3544,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, 
			bool was_ifup =

			    !!test_and_clear_bit(WL1271_FLAG_STA_STATE_SENT,

						 &wl->flags);

			wl->aid = 0;

			wlvif->aid = 0;



			/* free probe-request template */

			dev_kfree_skb(wlvif->probereq);

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;



	/* Our association ID */

	u16 aid;



	u32 bitrate_masks[IEEE80211_NUM_BANDS];



	/* The current band */
@@ -641,6 +638,9 @@ struct wl12xx_vif { 


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

	struct sk_buff *probereq;



	/* Our association ID */

	u16 aid;

};



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