1 files changed, 17 insertions, 3 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 55d61000e342..f65fd6e5fecc 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -226,6 +226,7 @@ static int iwl4965_rx_init(struct iwl4965_priv *priv, struct iwl4965_rx_queue *r
 {
         int rc;
         unsigned long flags;
+        unsigned int rb_size;
 
         spin_lock_irqsave(&priv->lock, flags);
         rc = iwl4965_grab_nic_access(priv);
@@ -234,6 +235,11 @@ static int iwl4965_rx_init(struct iwl4965_priv *priv, struct iwl4965_rx_queue *r
                 return rc;
         }
 
+        if (iwl4965_param_amsdu_size_8K)
+                rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K;
+        else
+                rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K;
+
         /* Stop Rx DMA */
         iwl4965_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG, 0);
 
@@ -253,7 +259,7 @@ static int iwl4965_rx_init(struct iwl4965_priv *priv, struct iwl4965_rx_queue *r
         iwl4965_write_direct32(priv, FH_MEM_RCSR_CHNL0_CONFIG_REG,
                              FH_RCSR_RX_CONFIG_CHNL_EN_ENABLE_VAL |
                              FH_RCSR_CHNL0_RX_CONFIG_IRQ_DEST_INT_HOST_VAL |
-                             IWL_FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_4K |
+                             rb_size |
                              /*0x10 << 4 | */
                              (RX_QUEUE_SIZE_LOG <<
                               FH_RCSR_RX_CONFIG_RBDCB_SIZE_BITSHIFT));
@@ -1771,7 +1777,11 @@ int iwl4965_hw_set_hw_setting(struct iwl4965_priv *priv)
         priv->hw_setting.tx_cmd_len = sizeof(struct iwl4965_tx_cmd);
         priv->hw_setting.max_rxq_size = RX_QUEUE_SIZE;
         priv->hw_setting.max_rxq_log = RX_QUEUE_SIZE_LOG;
-
+        if (iwl4965_param_amsdu_size_8K)
+                priv->hw_setting.rx_buf_size = IWL_RX_BUF_SIZE_8K;
+        else
+                priv->hw_setting.rx_buf_size = IWL_RX_BUF_SIZE_4K;
+        priv->hw_setting.max_pkt_size = priv->hw_setting.rx_buf_size - 256;
         priv->hw_setting.max_stations = IWL4965_STATION_COUNT;
         priv->hw_setting.bcast_sta_id = IWL4965_BROADCAST_ID;
         return 0;
@@ -3619,7 +3629,7 @@ static void iwl4965_handle_data_packet(struct iwl4965_priv *priv, int is_data,
                 rx_start->byte_count = amsdu->byte_count;
                 rx_end = (__le32 *) (((u8 *) hdr) + len);
         }
-        if (len > IWL_RX_BUF_SIZE || len < 16) {
+        if (len > priv->hw_setting.max_pkt_size || len < 16) {
                 IWL_WARNING("byte count out of range [16,4K]"
                                " : %d\n", len);
                 return;
@@ -3785,6 +3795,10 @@ void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info, int mode)
         ht_info->cap |= (u16)IEEE80211_HT_CAP_SGI_20;
         ht_info->cap |= (u16)(IEEE80211_HT_CAP_MIMO_PS &
                              (IWL_MIMO_PS_NONE << 2));
+        if (iwl4965_param_amsdu_size_8K) {
+                printk(KERN_DEBUG "iwl4965 in A-MSDU 8K support mode\n");
+                ht_info->cap |= (u16)IEEE80211_HT_CAP_MAX_AMSDU;
+        }
 
         ht_info->ampdu_factor = CFG_HT_RX_AMPDU_FACTOR_DEF;
         ht_info->ampdu_density = CFG_HT_MPDU_DENSITY_DEF;