aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index fa68305fd59e..cf0de3b0fe24 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -714,7 +714,7 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
714 struct sk_buff *skb; 714 struct sk_buff *skb;
715 int sent = 0; 715 int sent = 0;
716 struct ieee80211_sub_if_data *sdata; 716 struct ieee80211_sub_if_data *sdata;
717 struct ieee80211_tx_packet_data *pkt_data; 717 struct ieee80211_tx_info *info;
718 DECLARE_MAC_BUF(mac); 718 DECLARE_MAC_BUF(mac);
719 719
720 sdata = sta->sdata; 720 sdata = sta->sdata;
@@ -734,13 +734,13 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
734 734
735 /* Send all buffered frames to the station */ 735 /* Send all buffered frames to the station */
736 while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) { 736 while ((skb = skb_dequeue(&sta->tx_filtered)) != NULL) {
737 pkt_data = (struct ieee80211_tx_packet_data *) skb->cb; 737 info = IEEE80211_SKB_CB(skb);
738 sent++; 738 sent++;
739 pkt_data->flags |= IEEE80211_TXPD_REQUEUE; 739 info->flags |= IEEE80211_TX_CTL_REQUEUE;
740 dev_queue_xmit(skb); 740 dev_queue_xmit(skb);
741 } 741 }
742 while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) { 742 while ((skb = skb_dequeue(&sta->ps_tx_buf)) != NULL) {
743 pkt_data = (struct ieee80211_tx_packet_data *) skb->cb; 743 info = IEEE80211_SKB_CB(skb);
744 local->total_ps_buffered--; 744 local->total_ps_buffered--;
745 sent++; 745 sent++;
746#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG 746#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
@@ -748,7 +748,7 @@ static int ap_sta_ps_end(struct net_device *dev, struct sta_info *sta)
748 "since STA not sleeping anymore\n", dev->name, 748 "since STA not sleeping anymore\n", dev->name,
749 print_mac(mac, sta->addr), sta->aid); 749 print_mac(mac, sta->addr), sta->aid);
750#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ 750#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
751 pkt_data->flags |= IEEE80211_TXPD_REQUEUE; 751 info->flags |= IEEE80211_TX_CTL_REQUEUE;
752 dev_queue_xmit(skb); 752 dev_queue_xmit(skb);
753 } 753 }
754 754