--- net/mac80211/main.c

+++ net/mac80211/main.c

@@ -441,7 +441,6 @@ void ieee80211_tx_status(struct ieee8021

rcu_read_lock();

sband = local->hw.wiphy->bands[info->band];

- fc = hdr->frame_control;

sta = sta_info_get(local, hdr->addr1);

@@ -523,20 +522,6 @@ void ieee80211_tx_status(struct ieee8021

local->dot11FailedCount++;

}

- if (ieee80211_is_nullfunc(fc) && ieee80211_has_pm(fc) &&

- (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS) &&

- !(info->flags & IEEE80211_TX_CTL_INJECTED) &&

- local->ps_sdata && !(local->scanning)) {

- if (info->flags & IEEE80211_TX_STAT_ACK) {

- local->ps_sdata->u.mgd.flags |=

- IEEE80211_STA_NULLFUNC_ACKED;

- ieee80211_queue_work(&local->hw,

- &local->dynamic_ps_enable_work);

- } else

- mod_timer(&local->dynamic_ps_timer, jiffies +

- msecs_to_jiffies(10));

- }

-

/* this was a transmitted frame, but now we want to reuse it */

skb_orphan(skb);

@@ -859,8 +844,6 @@ int ieee80211_register_hw(struct ieee802

* and we need some headroom for passing the frame to monitor

* interfaces, but never both at the same time.

*/

- BUILD_BUG_ON(IEEE80211_TX_STATUS_HEADROOM !=

- sizeof(struct ieee80211_tx_status_rtap_hdr));

local->tx_headroom = max_t(unsigned int , local->hw.extra_tx_headroom,

sizeof(struct ieee80211_tx_status_rtap_hdr));