--- drivers/net/wireless/ath/ath9k/xmit.c

+++ drivers/net/wireless/ath/ath9k/xmit.c

@@ -1320,25 +1320,6 @@ static enum ath9k_pkt_type get_hw_packet

return htype;

}

-static bool is_pae(struct sk_buff *skb)

-{

- struct ieee80211_hdr *hdr;

- __le16 fc;

-

- hdr = (struct ieee80211_hdr *)skb->data;

- fc = hdr->frame_control;

-

- if (ieee80211_is_data(fc)) {

- if (ieee80211_is_nullfunc(fc) ||

- /* Port Access Entity (IEEE 802.1X) */

- (skb->protocol == cpu_to_be16(ETH_P_PAE))) {

- return true;

- }

- }

-

- return false;

-}

-

static int get_hw_crypto_keytype(struct sk_buff *skb)

{

struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);

@@ -1648,7 +1629,7 @@ static void ath_tx_start_dma(struct ath_

goto tx_done;

}

- if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {

+ if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {

/*

* Try aggregation if it's a unicast data frame

* and the destination is HT capable.

@@ -1998,10 +1979,9 @@ static void ath_tx_processq(struct ath_s

if (bf->bf_isnullfunc &&

(ds->ds_txstat.ts_status & ATH9K_TX_ACKED)) {

- if ((sc->sc_flags & SC_OP_PS_ENABLED)) {

- sc->ps_enabled = true;

- ath9k_hw_setrxabort(sc->sc_ah, 1);

- } else

+ if ((sc->sc_flags & SC_OP_PS_ENABLED))

+ ath9k_enable_ps(sc);

+ else

sc->sc_flags |= SC_OP_NULLFUNC_COMPLETED;

}