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

Commit c9ee23df authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

[MAC80211]: make assoc_ap a flag 



The sta_info.assoc_ap value is used as a flag, move it
into flags.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Acked-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52aa944a

net/mac80211/ieee80211_sta.c

+1 −2
Original line number Diff line number Diff line
@@ -1279,8 +1279,7 @@ static void ieee80211_rx_mgmt_assoc_resp(struct net_device *dev, 
	}



	sta->dev = dev;

	sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;

	sta->assoc_ap = 1;

	sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC | WLAN_STA_ASSOC_AP;



	rates = 0;

	mode = local->oper_hw_mode;

net/mac80211/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -1398,7 +1398,7 @@ void __ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, 
	skb = rx.skb;



	skb_push(skb, radiotap_len);

	if (sta && !sta->assoc_ap && !(sta->flags & WLAN_STA_WDS) &&

	if (sta && !(sta->flags & (WLAN_STA_WDS | WLAN_STA_ASSOC_AP)) &&

	    !local->iff_promiscs && !is_multicast_ether_addr(hdr->addr1)) {

		rx.flags |= IEEE80211_TXRXD_RXRA_MATCH;

		ieee80211_invoke_rx_handlers(local, local->rx_handlers, &rx,

net/mac80211/sta_info.h

+2 −3
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
				    * send and receive non-IEEE 802.1X frames

				    */

#define WLAN_STA_SHORT_PREAMBLE BIT(7)

/* whether this is an AP that we are associated with as a client */

#define WLAN_STA_ASSOC_AP BIT(8)

#define WLAN_STA_WME BIT(9)

#define WLAN_STA_WDS BIT(27)
@@ -90,9 +92,6 @@ struct sta_info { 
	int channel_use;

	int channel_use_raw;



	int assoc_ap; /* whether this is an AP that we are

		       * associated with as a client */



#ifdef CONFIG_MAC80211_DEBUG_COUNTERS

	unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES];

	unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES];