mac80211: allow software PS-Poll/U-APSD with AP_LINK_PS

[cascardo/linux.git] / net / mac80211 / rx.c

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index c2b659e..5e65e83 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -322,7 +322,7 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
        else if (status->flag & RX_FLAG_5MHZ)
                channel_flags |= IEEE80211_CHAN_QUARTER;
 
-       if (status->band == IEEE80211_BAND_5GHZ)
+       if (status->band == NL80211_BAND_5GHZ)
                channel_flags |= IEEE80211_CHAN_OFDM | IEEE80211_CHAN_5GHZ;
        else if (status->flag & (RX_FLAG_HT | RX_FLAG_VHT))
                channel_flags |= IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ;
@@ -1319,13 +1319,52 @@ int ieee80211_sta_ps_transition(struct ieee80211_sta *pubsta, bool start)
 }
 EXPORT_SYMBOL(ieee80211_sta_ps_transition);
 
+void ieee80211_sta_pspoll(struct ieee80211_sta *pubsta)
+{
+       struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
+
+       if (test_sta_flag(sta, WLAN_STA_SP))
+               return;
+
+       if (!test_sta_flag(sta, WLAN_STA_PS_DRIVER))
+               ieee80211_sta_ps_deliver_poll_response(sta);
+       else
+               set_sta_flag(sta, WLAN_STA_PSPOLL);
+}
+EXPORT_SYMBOL(ieee80211_sta_pspoll);
+
+void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *pubsta, u8 tid)
+{
+       struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
+       u8 ac = ieee802_1d_to_ac[tid & 7];
+
+       /*
+        * If this AC is not trigger-enabled do nothing.
+        *
+        * NB: This could/should check a separate bitmap of trigger-
+        * enabled queues, but for now we only implement uAPSD w/o
+        * TSPEC changes to the ACs, so they're always the same.
+        */
+       if (!(sta->sta.uapsd_queues & BIT(ac)))
+               return;
+
+       /* if we are in a service period, do nothing */
+       if (test_sta_flag(sta, WLAN_STA_SP))
+               return;
+
+       if (!test_sta_flag(sta, WLAN_STA_PS_DRIVER))
+               ieee80211_sta_ps_deliver_uapsd(sta);
+       else
+               set_sta_flag(sta, WLAN_STA_UAPSD);
+}
+EXPORT_SYMBOL(ieee80211_sta_uapsd_trigger);
+
 static ieee80211_rx_result debug_noinline
 ieee80211_rx_h_uapsd_and_pspoll(struct ieee80211_rx_data *rx)
 {
        struct ieee80211_sub_if_data *sdata = rx->sdata;
        struct ieee80211_hdr *hdr = (void *)rx->skb->data;
        struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb);
-       int tid, ac;
 
        if (!rx->sta)
                return RX_CONTINUE;
@@ -1351,12 +1390,7 @@ ieee80211_rx_h_uapsd_and_pspoll(struct ieee80211_rx_data *rx)
                return RX_CONTINUE;
 
        if (unlikely(ieee80211_is_pspoll(hdr->frame_control))) {
-               if (!test_sta_flag(rx->sta, WLAN_STA_SP)) {
-                       if (!test_sta_flag(rx->sta, WLAN_STA_PS_DRIVER))
-                               ieee80211_sta_ps_deliver_poll_response(rx->sta);
-                       else
-                               set_sta_flag(rx->sta, WLAN_STA_PSPOLL);
-               }
+               ieee80211_sta_pspoll(&rx->sta->sta);
 
                /* Free PS Poll skb here instead of returning RX_DROP that would
                 * count as an dropped frame. */
@@ -1368,27 +1402,11 @@ ieee80211_rx_h_uapsd_and_pspoll(struct ieee80211_rx_data *rx)
                   ieee80211_has_pm(hdr->frame_control) &&
                   (ieee80211_is_data_qos(hdr->frame_control) ||
                    ieee80211_is_qos_nullfunc(hdr->frame_control))) {
-               tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;
-               ac = ieee802_1d_to_ac[tid & 7];
+               u8 tid;
 
-               /*
-                * If this AC is not trigger-enabled do nothing.
-                *
-                * NB: This could/should check a separate bitmap of trigger-
-                * enabled queues, but for now we only implement uAPSD w/o
-                * TSPEC changes to the ACs, so they're always the same.
-                */
-               if (!(rx->sta->sta.uapsd_queues & BIT(ac)))
-                       return RX_CONTINUE;
-
-               /* if we are in a service period, do nothing */
-               if (test_sta_flag(rx->sta, WLAN_STA_SP))
-                       return RX_CONTINUE;
+               tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;
 
-               if (!test_sta_flag(rx->sta, WLAN_STA_PS_DRIVER))
-                       ieee80211_sta_ps_deliver_uapsd(rx->sta);
-               else
-                       set_sta_flag(rx->sta, WLAN_STA_UAPSD);
+               ieee80211_sta_uapsd_trigger(&rx->sta->sta, tid);
        }
 
        return RX_CONTINUE;
@@ -2823,7 +2841,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx)
 
                switch (mgmt->u.action.u.measurement.action_code) {
                case WLAN_ACTION_SPCT_MSR_REQ:
-                       if (status->band != IEEE80211_BAND_5GHZ)
+                       if (status->band != NL80211_BAND_5GHZ)
                                break;
 
                        if (len < (IEEE80211_MIN_ACTION_SIZE +
@@ -4043,7 +4061,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
 
        WARN_ON_ONCE(softirq_count() == 0);
 
-       if (WARN_ON(status->band >= IEEE80211_NUM_BANDS))
+       if (WARN_ON(status->band >= NUM_NL80211_BANDS))
                goto drop;
 
        sband = local->hw.wiphy->bands[status->band];