package/mac80211/patches/567-ath9k_remove_keycache_size.patch

   1 --- a/drivers/net/wireless/ath/ath9k/init.c
   2 +++ b/drivers/net/wireless/ath/ath9k/init.c
   3 @@ -407,13 +407,7 @@ void ath9k_init_crypto(struct ath_softc
   4         int i = 0;
   5
   6         /* Get the hardware key cache size. */
   7 -       common->keymax = sc->sc_ah->caps.keycache_size;
   8 -       if (common->keymax > ATH_KEYMAX) {
   9 -               ath_dbg(common, ATH_DBG_ANY,
  10 -                       "Warning, using only %u entries in %u key cache\n",
  11 -                       ATH_KEYMAX, common->keymax);
  12 -               common->keymax = ATH_KEYMAX;
  13 -       }
  14 +       common->keymax = AR_KEYTABLE_SIZE;
  15
  16         /*
  17          * Reset the key cache since some parts do not
  18 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
  19 +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
  20 @@ -564,13 +564,7 @@ static void ath9k_init_crypto(struct ath
  21         int i = 0;
  22
  23         /* Get the hardware key cache size. */
  24 -       common->keymax = priv->ah->caps.keycache_size;
  25 -       if (common->keymax > ATH_KEYMAX) {
  26 -               ath_dbg(common, ATH_DBG_ANY,
  27 -                       "Warning, using only %u entries in %u key cache\n",
  28 -                       ATH_KEYMAX, common->keymax);
  29 -               common->keymax = ATH_KEYMAX;
  30 -       }
  31 +       common->keymax = AR_KEYTABLE_SIZE;
  32
  33         if (priv->ah->misc_mode & AR_PCU_MIC_NEW_LOC_ENA)
  34                 common->crypt_caps |= ATH_CRYPT_CAP_MIC_COMBINED;
  35 --- a/drivers/net/wireless/ath/ath9k/hw.c
  36 +++ b/drivers/net/wireless/ath/ath9k/hw.c
  37 @@ -1889,12 +1889,6 @@ int ath9k_hw_fill_cap_info(struct ath_hw
  38         else
  39                 pCap->hw_caps &= ~ATH9K_HW_CAP_HT;
  40
  41 -       if (capField & AR_EEPROM_EEPCAP_KC_ENTRIES)
  42 -               pCap->keycache_size =
  43 -                       1 << MS(capField, AR_EEPROM_EEPCAP_KC_ENTRIES);
  44 -       else
  45 -               pCap->keycache_size = AR_KEYTABLE_SIZE;
  46 -
  47         if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
  48                 pCap->tx_triglevel_max = MAX_TX_FIFO_THRESHOLD >> 1;
  49         else
  50 --- a/drivers/net/wireless/ath/ath9k/hw.h
  51 +++ b/drivers/net/wireless/ath/ath9k/hw.h
  52 @@ -191,7 +191,6 @@ enum ath9k_hw_caps {
  53
  54  struct ath9k_hw_capabilities {
  55         u32 hw_caps; /* ATH9K_HW_CAP_* from ath9k_hw_caps */
  56 -       u16 keycache_size;
  57         u16 low_5ghz_chan, high_5ghz_chan;
  58         u16 low_2ghz_chan, high_2ghz_chan;
  59         u16 rts_aggr_limit;