2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								/******************************************************************************
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-15 13:43:41 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								 * Copyright(c) 2008 - 2010 Intel Corporation. All rights reserved.
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * This program is free software; you can redistribute it and/or modify it
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * under the terms of version 2 of the GNU General Public License as
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * published by the Free Software Foundation.
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * This program is distributed in the hope that it will be useful, but WITHOUT
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * more details.
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * You should have received a copy of the GNU General Public License along with
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * this program; if not, write to the Free Software Foundation, Inc.,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * The full GNU General Public License is included in this distribution in the
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * file called LICENSE.
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * Contact Information:
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *  Intel Linux Wireless <ilw@linux.intel.com>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 *****************************************************************************/
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/kernel.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/module.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/init.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/pci.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/dma-mapping.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/delay.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/skbuff.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/netdevice.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/wireless.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <net/mac80211.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <linux/etherdevice.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include <asm/unaligned.h>
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include "iwl-eeprom.h"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include "iwl-dev.h"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include "iwl-core.h"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include "iwl-io.h"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include "iwl-sta.h"
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-21 06:21:10 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#include "iwl-agn.h"
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#include "iwl-helpers.h"
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#include "iwl-agn-hw.h"
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#include "iwl-6000-hw.h"
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-02 13:44:03 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#include "iwl-agn-led.h"
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-08 15:29:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#include "iwl-agn-debugfs.h"
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								/* Highest firmware API version supported */
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-21 13:34:18 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#define IWL6000_UCODE_API_MAX 4
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define IWL6050_UCODE_API_MAX 4
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-07 18:06:36 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#define IWL6000G2_UCODE_API_MAX 4
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								/* Lowest firmware API version supported */
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:34 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#define IWL6000_UCODE_API_MIN 4
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define IWL6050_UCODE_API_MIN 4
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-07 18:06:36 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#define IWL6000G2_UCODE_API_MIN 4
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define IWL6000_FW_PRE "iwlwifi-6000-"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define _IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define IWL6000_MODULE_FIRMWARE(api) _IWL6000_MODULE_FIRMWARE(api)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define IWL6050_FW_PRE "iwlwifi-6050-"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define _IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE #api ".ucode"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define IWL6050_MODULE_FIRMWARE(api) _IWL6050_MODULE_FIRMWARE(api)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-21 11:46:33 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#define IWL6000G2A_FW_PRE "iwlwifi-6000g2a-"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define _IWL6000G2A_MODULE_FIRMWARE(api) IWL6000G2A_FW_PRE #api ".ucode"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define IWL6000G2A_MODULE_FIRMWARE(api) _IWL6000G2A_MODULE_FIRMWARE(api)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								#define IWL6000G2B_FW_PRE "iwlwifi-6000g2b-"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define _IWL6000G2B_MODULE_FIRMWARE(api) IWL6000G2B_FW_PRE #api ".ucode"
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								#define IWL6000G2B_MODULE_FIRMWARE(api) _IWL6000G2B_MODULE_FIRMWARE(api)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-07 18:06:36 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								static void iwl6000_set_ct_threshold(struct iwl_priv *priv)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								{
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									/* want Celsius */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-18 22:03:05 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								/* Indicate calibration version to uCode. */
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								static void iwl6000_set_calib_version(struct iwl_priv *priv)
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-18 22:03:05 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								{
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									if (priv->cfg->need_dc_calib &&
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									    (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6))
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-18 22:03:05 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										iwl_set_bit(priv, CSR_GP_DRIVER_REG,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
												CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								/* NIC configuration for 6000 series */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								static void iwl6000_nic_config(struct iwl_priv *priv)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								{
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:10 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									u16 radio_cfg;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									/* write radio config values to register */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											    EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											    EEPROM_RF_CFG_STEP_MSK(radio_cfg) |
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											    EEPROM_RF_CFG_DASH_MSK(radio_cfg));
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									/* set CSR_HW_CONFIG_REG for uCode use */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									/* no locking required for register write */
							 | 
						
					
						
							
								
									
										
										
										
											2009-11-06 14:52:55 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									if (priv->cfg->pa_type == IWL_PA_INTERNAL) {
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										/* 2x2 IPA phy type */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										iwl_write32(priv, CSR_GP_DRIVER_REG,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											     CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									/* else do nothing, uCode configured */
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-18 22:03:05 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									if (priv->cfg->ops->lib->temp_ops.set_calib_version)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										priv->cfg->ops->lib->temp_ops.set_calib_version(priv);
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								static struct iwl_sensitivity_ranges iwl6000_sensitivity = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.min_nrg_cck = 97,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_nrg_cck = 0, /* not used, set to 0 */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_min_ofdm = 80,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_min_ofdm_mrc = 128,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_min_ofdm_x1 = 105,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_min_ofdm_mrc_x1 = 192,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_max_ofdm = 145,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_max_ofdm_mrc = 232,
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-20 12:22:52 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.auto_corr_max_ofdm_x1 = 110,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.auto_corr_max_ofdm_mrc_x1 = 232,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_min_cck = 125,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_max_cck = 175,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_min_cck_mrc = 160,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.auto_corr_max_cck_mrc = 310,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.nrg_th_cck = 97,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.nrg_th_ofdm = 100,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-09 13:20:24 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.barker_corr_th_min = 190,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.barker_corr_th_min_mrc = 390,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.nrg_th_cca = 62,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								{
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-09 13:20:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									if (priv->cfg->mod_params->num_of_queues >= IWL_MIN_NUM_QUEUES &&
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									    priv->cfg->mod_params->num_of_queues <= IWLAGN_NUM_QUEUES)
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-09 13:20:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										priv->cfg->num_of_queues =
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											priv->cfg->mod_params->num_of_queues;
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-09 13:20:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.max_txq_num = priv->cfg->num_of_queues;
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.dma_chnl_num = FH50_TCSR_CHNL_NUM;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.scd_bc_tbls_size =
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-09 13:20:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
											priv->cfg->num_of_queues *
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
											sizeof(struct iwlagn_scd_bc_tbl);
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.tfd_size = sizeof(struct iwl_tfd);
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-24 14:08:05 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.max_stations = IWLAGN_STATION_COUNT;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.bcast_sta_id = IWLAGN_BROADCAST_ID;
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.max_data_size = IWL60_RTC_DATA_SIZE;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.max_inst_size = IWL60_RTC_INST_SIZE;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.max_bsm_size = 0;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
													BIT(IEEE80211_BAND_5GHZ);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									if (priv->cfg->ops->lib->temp_ops.set_ct_kill)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									/* Set initial sensitivity parameters */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									/* Set initial calibration set */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.sens = &iwl6000_sensitivity;
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-19 18:49:40 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.calib_init_cfg =
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										BIT(IWL_CALIB_XTAL)		|
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										BIT(IWL_CALIB_LO)		|
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										BIT(IWL_CALIB_TX_IQ)		|
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										BIT(IWL_CALIB_BASE_BAND);
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									if (priv->cfg->need_dc_calib)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC);
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-22 14:22:47 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 08:54:10 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									return 0;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 08:54:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
												     struct ieee80211_channel_switch *ch_switch)
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:29 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								{
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									struct iwl6000_channel_switch_cmd cmd;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									const struct iwl_channel_info *ch_info;
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 08:54:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									u32 switch_time_in_usec, ucode_switch_time;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									u16 ch;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									u32 tsf_low;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									u8 switch_count;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									u16 beacon_interval = le16_to_cpu(priv->rxon_timing.beacon_interval);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									struct ieee80211_vif *vif = priv->vif;
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:29 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									struct iwl_host_cmd hcmd = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.id = REPLY_CHANNEL_SWITCH,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.len = sizeof(cmd),
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-18 09:18:06 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.flags = CMD_SYNC,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:29 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.data = &cmd,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									cmd.band = priv->band == IEEE80211_BAND_2GHZ;
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 08:54:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									ch = ieee80211_frequency_to_channel(ch_switch->channel->center_freq);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										      priv->active_rxon.channel, ch);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									cmd.channel = cpu_to_le16(ch);
							 | 
						
					
						
							
								
									
										
										
										
											2009-11-06 14:52:54 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									cmd.rxon_flags = priv->staging_rxon.flags;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									cmd.rxon_filter_flags = priv->staging_rxon.filter_flags;
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 08:54:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									switch_count = ch_switch->count;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									tsf_low = ch_switch->timestamp & 0x0ffffffff;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									/*
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									 * calculate the ucode channel switch time
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									 * adding TSF as one of the factor for when to switch
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									 */
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										if (switch_count > ((priv->ucode_beacon_time - tsf_low) /
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										    beacon_interval)) {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											switch_count -= (priv->ucode_beacon_time -
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
												tsf_low) / beacon_interval;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										} else
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											switch_count = 0;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									if (switch_count <= 1)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									else {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										switch_time_in_usec =
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										ucode_switch_time = iwl_usecs_to_beacons(priv,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
															 switch_time_in_usec,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
															 beacon_interval);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										cmd.switch_time = iwl_add_beacon_time(priv,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
														      priv->ucode_beacon_time,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
														      ucode_switch_time,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
														      beacon_interval);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										      cmd.switch_time);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									ch_info = iwl_get_channel_info(priv, priv->band, ch);
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:29 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									if (ch_info)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										cmd.expect_beacon = is_channel_radar(ch_info);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									else {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										IWL_ERR(priv, "invalid channel switch from %u to %u\n",
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 08:54:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
											priv->active_rxon.channel, ch);
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:29 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										return -EFAULT;
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									}
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 08:54:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									priv->switch_rxon.channel = cmd.channel;
							 | 
						
					
						
							
								
									
										
										
										
											2009-11-06 14:52:54 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									priv->switch_rxon.switch_in_progress = true;
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:29 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									return iwl_send_cmd_sync(priv, &hcmd);
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								static struct iwl_lib_ops iwl6000_lib = {
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.set_hw_params = iwl6000_hw_set_hw_params,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:22 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.txq_update_byte_cnt_tbl = iwlagn_txq_update_byte_cnt_tbl,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.txq_inval_byte_cnt_tbl = iwlagn_txq_inval_byte_cnt_tbl,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.txq_set_sched = iwlagn_txq_set_sched,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.txq_agg_enable = iwlagn_txq_agg_enable,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.txq_agg_disable = iwlagn_txq_agg_disable,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.txq_attach_buf_to_tfd = iwl_hw_txq_attach_buf_to_tfd,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.txq_free_tfd = iwl_hw_txq_free_tfd,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.txq_init = iwl_hw_tx_queue_init,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:47:58 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.rx_handler_setup = iwlagn_rx_handler_setup,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.setup_deferred_work = iwlagn_setup_deferred_work,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 10:23:30 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.load_ucode = iwlagn_load_ucode,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.dump_nic_event_log = iwl_dump_nic_event_log,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.dump_nic_error_log = iwl_dump_nic_error_log,
							 | 
						
					
						
							
								
									
										
										
										
											2009-12-10 14:37:25 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.dump_csr = iwl_dump_csr,
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-15 13:43:39 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.dump_fh = iwl_dump_fh,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:24 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.init_alive_start = iwlagn_init_alive_start,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.alive_notify = iwlagn_alive_notify,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:47:58 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.send_tx_power = iwlagn_send_tx_power,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.update_chain_flags = iwl_update_chain_flags,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:29 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.set_channel_switch = iwl6000_hw_channel_switch,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.apm_ops = {
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.init = iwl_apm_init,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-02 13:44:04 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.stop = iwl_apm_stop,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.config = iwl6000_nic_config,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.set_pwr_src = iwl_set_pwr_src,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									},
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ops = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.regulatory_bands = {
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:47:58 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
											EEPROM_REG_BAND_1_CHANNELS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											EEPROM_REG_BAND_2_CHANNELS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											EEPROM_REG_BAND_3_CHANNELS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											EEPROM_REG_BAND_4_CHANNELS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
											EEPROM_REG_BAND_5_CHANNELS,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-07 18:37:52 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
											EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:47:58 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
											EEPROM_REG_BAND_52_HT40_CHANNELS
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										},
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.verify_signature  = iwlcore_eeprom_verify_signature,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.release_semaphore = iwlcore_eeprom_release_semaphore,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:47:58 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.calib_version	= iwlagn_eeprom_calib_version,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.query_addr = iwlagn_eeprom_query_addr,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-21 13:34:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.update_enhanced_txpower = iwlcore_eeprom_enhanced_txpower,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									},
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.post_associate = iwl_post_associate,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.isr = iwl_isr_ict,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.config_ap = iwl_config_ap,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.temp_ops = {
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:47:58 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.temperature = iwlagn_temperature,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.set_ct_kill = iwl6000_set_ct_threshold,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.set_calib_version = iwl6000_set_calib_version,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									 },
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-28 08:44:52 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.manage_ibss_station = iwlagn_manage_ibss_station,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-14 13:10:29 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.update_bcast_station = iwl_update_bcast_station,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-08 15:29:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.debugfs_ops = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.rx_stats_read = iwl_ucode_rx_stats_read,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.tx_stats_read = iwl_ucode_tx_stats_read,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
										.general_stats_read = iwl_ucode_general_stats_read,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-14 08:09:55 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
										.bt_stats_read = iwl_ucode_bt_stats_read,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-08 15:29:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									},
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-01 17:23:50 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.recover_from_tx_stall = iwl_bg_monitor_recover,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-05 14:22:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.check_plcp_health = iwl_good_plcp_health,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.check_ack_health = iwl_good_ack_health,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-24 13:22:36 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.txfifo_flush = iwlagn_txfifo_flush,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-24 13:18:35 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.dev_txfifo_flush = iwlagn_dev_txfifo_flush,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-12-14 00:59:53 +01:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								static const struct iwl_ops iwl6000_ops = {
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-24 11:13:01 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.lib = &iwl6000_lib,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 10:23:31 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.hcmd = &iwlagn_hcmd,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.utils = &iwlagn_hcmd_utils,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-02 13:44:03 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.led = &iwlagn_led_ops,
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-29 11:09:16 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								static void do_not_send_bt_config(struct iwl_priv *priv)
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								{
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								}
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								static struct iwl_hcmd_ops iwl6000g2b_hcmd = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.rxon_assoc = iwlagn_send_rxon_assoc,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.commit_rxon = iwl_commit_rxon,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_rxon_chain = iwl_set_rxon_chain,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_tx_ant = iwlagn_send_tx_ant_config,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.send_bt_config = do_not_send_bt_config,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								static const struct iwl_ops iwl6000g2b_ops = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.lib = &iwl6000_lib,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.hcmd = &iwl6000g2b_hcmd,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.utils = &iwlagn_hcmd_utils,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led = &iwlagn_led_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-21 11:46:33 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2a_2agn_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 2x2 AGN Gen2a",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2A_FW_PRE,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-07 18:06:36 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-17 16:16:12 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-07 18:06:36 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-17 16:16:12 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-09 09:36:11 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-17 16:16:12 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ht_greenfield_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
											 
										 
										
											
												iwlagn: fix rts cts protection
Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.
In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS
To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.
To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).
Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.
Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.
Cc: stable@kernel.org [2.6.35]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
											
										 
										
											2010-08-09 10:57:02 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_rts_for_aggregation = true, /* use rts/cts protection */
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-17 16:16:12 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-21 11:46:33 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-27 14:00:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ucode_tracing = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-25 15:41:43 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-17 16:16:12 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2a_2abg_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 2x2 ABG Gen2a",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2A_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-21 12:15:17 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2a_2bg_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 2x2 BG Gen2a",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2A_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_G,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-21 12:15:17 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2b_2agn_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 2x2 AGN Gen2b",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2B_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000g2b_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ht_greenfield_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
											 
										 
										
											
												iwlagn: fix rts cts protection
Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.
In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS
To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.
To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).
Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.
Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.
Cc: stable@kernel.org [2.6.35]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
											
										 
										
											2010-08-09 10:57:02 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_rts_for_aggregation = true, /* use rts/cts protection */
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:40 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-21 12:15:17 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-14 08:08:05 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.bt_statistics = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2b_2abg_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 2x2 ABG Gen2b",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2B_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000g2b_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:40 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-21 12:15:17 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-14 08:08:05 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.bt_statistics = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-11 15:21:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2b_2bgn_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 2x2 BGN Gen2b",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2B_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_G|IWL_SKU_N,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000g2b_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ht_greenfield_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
											 
										 
										
											
												iwlagn: fix rts cts protection
Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.
In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS
To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.
To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).
Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.
Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.
Cc: stable@kernel.org [2.6.35]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
											
										 
										
											2010-08-09 10:57:02 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_rts_for_aggregation = true, /* use rts/cts protection */
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-11 15:21:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:40 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-11 15:21:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-21 12:15:17 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-14 08:08:05 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.bt_statistics = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-11 15:21:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2b_2bg_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 2x2 BG Gen2b",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2B_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_G,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000g2b_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:40 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-21 12:15:17 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-14 08:08:05 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.bt_statistics = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2b_bgn_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 1x2 BGN Gen2b",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2B_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_G|IWL_SKU_N,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000g2b_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_A,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ht_greenfield_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
											 
										 
										
											
												iwlagn: fix rts cts protection
Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.
In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS
To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.
To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).
Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.
Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.
Cc: stable@kernel.org [2.6.35]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
											
										 
										
											2010-08-09 10:57:02 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_rts_for_aggregation = true, /* use rts/cts protection */
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:40 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-21 12:15:17 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-14 08:08:05 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.bt_statistics = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000g2b_bg_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6000 Series 1x2 BG Gen2b",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000G2B_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000G2_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000G2_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_G,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000g2b_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_A,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:40 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_LONG_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 512,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-21 12:15:17 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-14 08:08:05 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.bt_statistics = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-21 11:46:33 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								/*
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 * "i": Internal configuration, use internal Power Amplifier
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								 */
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000i_2agn_cfg = {
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-05 17:05:20 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:46 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_BC,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_BC,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-30 14:36:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_INTERNAL,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:59 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ht_greenfield_support = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:14 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
											 
										 
										
											
												iwlagn: fix rts cts protection
Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.
In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS
To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.
To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).
Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.
Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.
Cc: stable@kernel.org [2.6.35]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
											
										 
										
											2010-08-09 10:57:02 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_rts_for_aggregation = true, /* use rts/cts protection */
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-22 14:22:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-05 11:33:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-26 12:54:37 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 1024,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-27 14:00:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ucode_tracing = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-25 15:41:43 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000i_2abg_cfg = {
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-05 17:05:20 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.name = "Intel(R) Centrino(R) Advanced-N 6200 ABG",
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_BC,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_BC,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-30 14:36:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_INTERNAL,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-22 14:22:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-05 11:33:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-26 12:54:37 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 1024,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-27 14:00:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ucode_tracing = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-25 15:41:43 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000i_2bg_cfg = {
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-05 17:05:20 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.name = "Intel(R) Centrino(R) Advanced-N 6200 BG",
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_G,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_BC,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_BC,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-30 14:36:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_INTERNAL,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-22 14:22:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-05 11:33:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-26 12:54:37 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 1024,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-27 14:00:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ucode_tracing = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-25 15:41:43 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6050_2agn_cfg = {
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-05 17:05:20 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6050_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6050_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6050_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-16 14:25:51 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6050_EEPROM_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							
								
									
										
										
										
											2009-05-08 13:44:46 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-30 14:36:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-16 14:25:52 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x50,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:59 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ht_greenfield_support = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:14 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
											 
										 
										
											
												iwlagn: fix rts cts protection
Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.
In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS
To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.
To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).
Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.
Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.
Cc: stable@kernel.org [2.6.35]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
											
										 
										
											2010-08-09 10:57:02 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_rts_for_aggregation = true, /* use rts/cts protection */
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-29 17:27:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1500,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-29 17:27:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 1024,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_tracing = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6050g2_bgn_cfg = {
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.name = "6050 Series 1x2 BGN Gen2",
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6050_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6050_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6050_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_G|IWL_SKU_N,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6050G2_EEPROM_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6050G2_TX_POWER_VERSION,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_A,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x50,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ht_greenfield_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
											 
										 
										
											
												iwlagn: fix rts cts protection
Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.
In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS
To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.
To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).
Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.
Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.
Cc: stable@kernel.org [2.6.35]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
											
										 
										
											2010-08-09 10:57:02 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_rts_for_aggregation = true, /* use rts/cts protection */
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-29 17:27:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-22 14:22:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-05 11:33:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1500,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-26 12:54:37 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 1024,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-27 14:00:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ucode_tracing = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-25 15:41:43 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6050_2abg_cfg = {
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-05 17:05:20 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG",
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6050_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6050_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6050_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-16 14:25:51 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6050_EEPROM_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_AB,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_AB,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-30 14:36:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-16 14:25:52 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x50,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-22 14:22:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-05 11:33:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1500,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-26 12:54:37 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 1024,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-27 14:00:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ucode_tracing = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-25 15:41:43 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-06-15 16:14:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.need_dc_calib = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:53 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								struct iwl_cfg iwl6000_3agn_cfg = {
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-05 17:05:20 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.fw_name_pre = IWL6000_FW_PRE,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_max = IWL6000_UCODE_API_MAX,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.ucode_api_min = IWL6000_UCODE_API_MIN,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-29 11:09:16 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ops = &iwl6000_ops,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_size = OTP_LOW_IMAGE_SIZE,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-17 10:43:46 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_ver = EEPROM_6000_EEPROM_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 17:41:23 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.num_of_queues = IWLAGN_NUM_QUEUES,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-16 12:37:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.mod_params = &iwlagn_mod_params,
							 | 
						
					
						
							
								
									
										
										
										
											2009-02-02 16:21:14 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.valid_tx_ant = ANT_ABC,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.valid_rx_ant = ANT_ABC,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pll_cfg_val = 0,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-30 14:36:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.set_l0s = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_bsm = false,
							 | 
						
					
						
							
								
									
										
										
										
											2009-07-31 14:28:07 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.pa_type = IWL_PA_SYSTEM,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:54 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_ll_items = OTP_MAX_LL_ITEMS_6x00,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.shadow_ram_support = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-08-13 13:30:59 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ht_greenfield_support = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-11 10:38:14 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.led_compensation = 51,
							 | 
						
					
						
							
								
									
										
											 
										 
										
											
												iwlagn: fix rts cts protection
Currently the driver will try to protect all frames,
which leads to a lot of odd things like sending an
RTS with a zeroed RA before multicast frames, which
is clearly bogus.
In order to fix all of this, we need to take a step
back and see what we need to achieve:
 * we need RTS/CTS protection if requested by
   the AP for the BSS, mac80211 tells us this
 * in that case, CTS-to-self should only be
   enabled when mac80211 tells us
 * additionally, as a hardware workaround, on
   some devices we have to protect aggregated
   frames with RTS
To achieve the first two items, set up the RXON
accordingly and set the protection required flag
in the transmit command when mac80211 requests
protection for the frame.
To achieve the last item, set the rate-control
RTS-requested flag for all stations that we have
aggregation sessions with, and set the protection
required flag when sending aggregated frames (on
those devices where this is required).
Since otherwise bugs can occur, do not allow the
user to override the RTS-for-aggregation setting
from sysfs any more.
Finally, also clean up the way all these flags get
set in the driver and move everything into the
device-specific functions.
Cc: stable@kernel.org [2.6.35]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
											
										 
										
											2010-08-09 10:57:02 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.use_rts_for_aggregation = true, /* use rts/cts protection */
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:26 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,
							 | 
						
					
						
							
								
									
										
										
										
											2009-09-25 14:24:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.supports_idle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:27 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.adv_thermal_throttle = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-10-23 13:42:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.support_ct_kill_exit = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-01-22 14:22:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.plcp_delta_threshold = IWL_MAX_PLCP_ERR_THRESHOLD_DEF,
							 | 
						
					
						
							
								
									
										
										
										
											2010-02-05 11:33:46 -08:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.chain_noise_scale = 1000,
							 | 
						
					
						
							
								
									
										
										
										
											2010-07-23 13:19:39 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,
							 | 
						
					
						
							
								
									
										
										
										
											2010-03-26 12:54:37 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.max_event_log_size = 1024,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-27 14:00:28 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.ucode_tracing = true,
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-25 15:41:43 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
									.sensitivity_calib_by_driver = true,
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
									.chain_noise_calib_by_driver = true,
							 | 
						
					
						
							
								
									
										
										
										
											2009-01-19 15:30:34 -08:00
										 
									 
								 
							 | 
							
								
							 | 
							
								
							 | 
							
							
								};
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
							 | 
						
					
						
							| 
								
							 | 
							
								
							 | 
							
								
							 | 
							
							
								MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
							 | 
						
					
						
							
								
									
										
										
										
											2010-04-21 11:46:33 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								MODULE_FIRMWARE(IWL6000G2A_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
							 | 
						
					
						
							
								
									
										
										
										
											2010-05-06 10:15:21 -07:00
										 
									 
								 
							 | 
							
								
									
										
									
								
							 | 
							
								
							 | 
							
							
								MODULE_FIRMWARE(IWL6000G2B_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
							 |