mac80211: convert sta_info.pspoll to a flag

This doesn't really need to be a full int variable since it's
just a flag to indicate a PS-poll is in progress.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 279ee493520d3d9257ff4a187ebaa7ef4da307b2..c4b7cc07315de0b72cea166e006d61f789946b2c 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -579,7 +579,7 @@ static void ap_sta_ps_start(struct net_device *dev, struct sta_info *sta)
        if (sdata->bss)
                atomic_inc(&sdata->bss->num_sta_ps);
        sta->flags |= WLAN_STA_PS;
-       sta->pspoll = 0;
+       sta->flags &= ~WLAN_STA_PSPOLL;
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
        printk(KERN_DEBUG "%s: STA %s aid %d enters power save mode\n",
               dev->name, print_mac(mac, sta->addr), sta->aid);
@@ -598,8 +598,7 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
        sdata = IEEE80211_DEV_TO_SUB_IF(sta->dev);
        if (sdata->bss)
                atomic_dec(&sdata->bss->num_sta_ps);
-       sta->flags &= ~(WLAN_STA_PS | WLAN_STA_TIM);
-       sta->pspoll = 0;
+       sta->flags &= ~(WLAN_STA_PS | WLAN_STA_TIM | WLAN_STA_PSPOLL);
        if (!skb_queue_empty(&sta->ps_tx_buf)) {
                if (local->ops->set_tim)
                        local->ops->set_tim(local_to_hw(local), sta->aid, 0);
@@ -925,9 +924,11 @@ ieee80211_rx_h_ps_poll(struct ieee80211_txrx_data *rx)
                struct ieee80211_hdr *hdr =
                        (struct ieee80211_hdr *) skb->data;
 
-               /* tell TX path to send one frame even though the STA may
-                * still remain is PS mode after this frame exchange */
-               rx->sta->pspoll = 1;
+               /*
+                * Tell TX path to send one frame even though the STA may
+                * still remain is PS mode after this frame exchange.
+                */
+               rx->sta->flags |= WLAN_STA_PSPOLL;
 
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
                printk(KERN_DEBUG "STA %s aid %d: PS Poll (entries after %d)\n",

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 19f3fb41294052303afb2706335ac7ac4143aebe..ca51d29b70081b10509a26912d7ce7a9cdcfc70c 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -32,6 +32,7 @@
  * @WLAN_STA_ASSOC_AP: We're associated to that station, it is an AP.
  * @WLAN_STA_WME: Station is a QoS-STA.
  * @WLAN_STA_WDS: Station is one of our WDS peers.
+ * @WLAN_STA_PSPOLL: Station has just PS-polled us.
  */
 enum ieee80211_sta_info_flags {
        WLAN_STA_AUTH           = 1<<0,
@@ -43,6 +44,7 @@ enum ieee80211_sta_info_flags {
        WLAN_STA_ASSOC_AP       = 1<<6,
        WLAN_STA_WME            = 1<<7,
        WLAN_STA_WDS            = 1<<8,
+       WLAN_STA_PSPOLL         = 1<<9,
 };
 
 #define STA_TID_NUM 16
@@ -133,7 +135,6 @@ struct sta_info {
 
        struct sk_buff_head ps_tx_buf; /* buffer of TX frames for station in
                                        * power saving state */
-       int pspoll; /* whether STA has send a PS Poll frame */
        struct sk_buff_head tx_filtered; /* buffer of TX frames that were
                                          * already given to low-level driver,
                                          * but were filtered */

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 181d97015f614cb733f32bba8949af2a1be645c1..4f951e78df15103d1fac6b0252acd38588c83d6d 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -395,7 +395,8 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
                      (tx->fc & IEEE80211_FCTL_STYPE) == IEEE80211_STYPE_PROBE_RESP)))
                return TX_CONTINUE;
 
-       if (unlikely((sta->flags & WLAN_STA_PS) && !sta->pspoll)) {
+       if (unlikely((sta->flags & WLAN_STA_PS) &&
+                    !(sta->flags & WLAN_STA_PSPOLL))) {
                struct ieee80211_tx_packet_data *pkt_data;
 #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
                printk(KERN_DEBUG "STA %s aid %d: PS buffer (entries "
@@ -436,7 +437,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_txrx_data *tx)
                       print_mac(mac, sta->addr));
        }
 #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
-       sta->pspoll = 0;
+       sta->flags &= ~WLAN_STA_PSPOLL;
 
        return TX_CONTINUE;
 }