ath9k_htc: Fix TKIP encryption

Set IEEE80211_HW_RX_INCLUDES_FCS to indicate that
the FCS is present in RX frames. Also, remove a redundant
assignment of skb length and include the FCS_LEN
when checking padding.

Fixing this issue makes TKIP work.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index d8779b90713111e5ed67ec47a40756f8512aae07..90cfd9066abf0fb377703f831bfec7b92ae863d5 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -513,7 +513,8 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
        hw->flags = IEEE80211_HW_SIGNAL_DBM |
                IEEE80211_HW_AMPDU_AGGREGATION |
                IEEE80211_HW_SPECTRUM_MGMT |
-               IEEE80211_HW_HAS_RATE_CONTROL;
+               IEEE80211_HW_HAS_RATE_CONTROL |
+               IEEE80211_HW_RX_INCLUDES_FCS;
 
        hw->wiphy->interface_modes =
                BIT(NL80211_IFTYPE_STATION) |

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index befe5740e2b8dd4a7a088eefbc69e482279c2fec..f1e3d830d7de54932c21fea87c48da32098d228b 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -450,7 +450,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
        padpos = ath9k_cmn_padpos(fc);
 
        padsize = padpos & 3;
-       if (padsize && skb->len >= padpos+padsize) {
+       if (padsize && skb->len >= padpos+padsize+FCS_LEN) {
                memmove(skb->data + padsize, skb->data, padpos);
                skb_pull(skb, padsize);
        }
@@ -646,7 +646,6 @@ void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,
        spin_lock(&priv->rx.rxbuflock);
        memcpy(&rxbuf->rxstatus, rxstatus, HTC_RX_FRAME_HEADER_SIZE);
        skb_pull(skb, HTC_RX_FRAME_HEADER_SIZE);
-       skb->len = rxstatus->rs_datalen;
        rxbuf->skb = skb;
        rxbuf->in_process = true;
        spin_unlock(&priv->rx.rxbuflock);