Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	drivers/net/wireless/wl12xx/wl1271.h
	drivers/net/wireless/wl12xx/wl1271_cmd.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-dev.h
Simple merge

diff --cc drivers/net/wireless/mwl8k.c
Simple merge

diff --cc drivers/net/wireless/orinoco/hermes_dld.c
index 55741ca,f750f49..2b2b9a1
--- 1/drivers/net/wireless/orinoco/hermes_dld.c
--- 2/drivers/net/wireless/orinoco/hermes_dld.c
+++ b/drivers/net/wireless/orinoco/hermes_dld.c
@@@ -65,10 -65,10 +65,10 @@@ struct dblock 
        __le32 addr;            /* adapter address where to write the block */
        __le16 len;             /* length of the data only, in bytes */
        char data[0];           /* data to be written */
 -} __attribute__ ((packed));
 +} __packed;
  
  /*
-  * Plug Data References are located in in the image after the last data
+  * Plug Data References are located in the image after the last data
   * block.  They refer to areas in the adapter memory where the plug data
   * items with matching ID should be written.
   */

diff --cc drivers/net/wireless/orinoco/orinoco_usb.c
Simple merge

diff --cc drivers/net/wireless/orinoco/wext.c
Simple merge

diff --cc drivers/net/wireless/prism54/isl_ioctl.c
Simple merge

diff --cc drivers/net/wireless/rndis_wlan.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2800.h
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271.h
Simple merge

diff --cc drivers/net/wireless/wl12xx/wl1271_cmd.h
index d88faf9,68001df..f5745d8
--- 1/drivers/net/wireless/wl12xx/wl1271_cmd.h
--- 2/drivers/net/wireless/wl12xx/wl1271_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.h
@@@ -439,25 -439,31 +439,31 @@@ struct wl1271_general_parms_cmd 
  
        struct wl1271_cmd_test_header test;
  
-       u8 params[WL1271_NVS_GENERAL_PARAMS_SIZE];
-       s8 reserved[23];
- } __packed;
+       struct wl1271_ini_general_params general_params;
  
- #define WL1271_STAT_RADIO_PARAMS_5_SIZE    29
- #define WL1271_DYN_RADIO_PARAMS_5_SIZE    104
+       u8 sr_debug_table[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+       u8 sr_sen_n_p;
+       u8 sr_sen_n_p_gain;
+       u8 sr_sen_nrn;
+       u8 sr_sen_prn;
+       u8 padding[3];
 -} __attribute__ ((packed));
++} __packed;
  
  struct wl1271_radio_parms_cmd {
        struct wl1271_cmd_header header;
  
        struct wl1271_cmd_test_header test;
  
-       u8 stat_radio_params[WL1271_NVS_STAT_RADIO_PARAMS_SIZE];
-       u8 stat_radio_params_5[WL1271_STAT_RADIO_PARAMS_5_SIZE];
+       /* Static radio parameters */
+       struct wl1271_ini_band_params_2 static_params_2;
+       struct wl1271_ini_band_params_5 static_params_5;
  
-       u8 dyn_radio_params[WL1271_NVS_DYN_RADIO_PARAMS_SIZE];
-       u8 reserved;
-       u8 dyn_radio_params_5[WL1271_DYN_RADIO_PARAMS_5_SIZE];
+       /* Dynamic radio parameters */
+       struct wl1271_ini_fem_params_2 dyn_params_2;
+       u8 padding2;
+       struct wl1271_ini_fem_params_5 dyn_params_5;
+       u8 padding3[2];
 -} __attribute__ ((packed));
 +} __packed;
  
  struct wl1271_cmd_cal_channel_tune {
        struct wl1271_cmd_header header;

diff --cc drivers/net/wireless/wl12xx/wl1271_ini.h
index 0000000,0fb156a..2313047
mode 000000,100644..100644
--- /dev/null
--- 2/drivers/net/wireless/wl12xx/wl1271_ini.h
+++ b/drivers/net/wireless/wl12xx/wl1271_ini.h
@@@ -1,0 -1,123 +1,123 @@@
 -} __attribute__ ((packed));
+ /*
+  * This file is part of wl1271
+  *
+  * Copyright (C) 2010 Nokia Corporation
+  *
+  * Contact: Luciano Coelho <luciano.coelho@nokia.com>
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * version 2 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 St, Fifth Floor, Boston, MA
+  * 02110-1301 USA
+  *
+  */
+ 
+ #ifndef __WL1271_INI_H__
+ #define __WL1271_INI_H__
+ 
+ #define WL1271_INI_MAX_SMART_REFLEX_PARAM 16
+ 
+ struct wl1271_ini_general_params {
+       u8 ref_clock;
+       u8 settling_time;
+       u8 clk_valid_on_wakeup;
+       u8 dc2dc_mode;
+       u8 dual_mode_select;
+       u8 tx_bip_fem_auto_detect;
+       u8 tx_bip_fem_manufacturer;
+       u8 general_settings;
+       u8 sr_state;
+       u8 srf1[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+       u8 srf2[WL1271_INI_MAX_SMART_REFLEX_PARAM];
+       u8 srf3[WL1271_INI_MAX_SMART_REFLEX_PARAM];
 -} __attribute__ ((packed));
++} __packed;
+ 
+ #define WL1271_INI_RSSI_PROCESS_COMPENS_SIZE 15
+ 
+ struct wl1271_ini_band_params_2 {
+       u8 rx_trace_insertion_loss;
+       u8 tx_trace_loss;
+       u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];
 -} __attribute__ ((packed));
++} __packed;
+ 
+ #define WL1271_INI_RATE_GROUP_COUNT 6
+ #define WL1271_INI_CHANNEL_COUNT_2 14
+ 
+ struct wl1271_ini_fem_params_2 {
+       __le16 tx_bip_ref_pd_voltage;
+       u8 tx_bip_ref_power;
+       u8 tx_bip_ref_offset;
+       u8 tx_per_rate_pwr_limits_normal[WL1271_INI_RATE_GROUP_COUNT];
+       u8 tx_per_rate_pwr_limits_degraded[WL1271_INI_RATE_GROUP_COUNT];
+       u8 tx_per_rate_pwr_limits_extreme[WL1271_INI_RATE_GROUP_COUNT];
+       u8 tx_per_chan_pwr_limits_11b[WL1271_INI_CHANNEL_COUNT_2];
+       u8 tx_per_chan_pwr_limits_ofdm[WL1271_INI_CHANNEL_COUNT_2];
+       u8 tx_pd_vs_rate_offsets[WL1271_INI_RATE_GROUP_COUNT];
+       u8 tx_ibias[WL1271_INI_RATE_GROUP_COUNT];
+       u8 rx_fem_insertion_loss;
+       u8 degraded_low_to_normal_thr;
+       u8 normal_to_degraded_high_thr;
 -} __attribute__ ((packed));
++} __packed;
+ 
+ #define WL1271_INI_CHANNEL_COUNT_5 35
+ #define WL1271_INI_SUB_BAND_COUNT_5 7
+ 
+ struct wl1271_ini_band_params_5 {
+       u8 rx_trace_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];
+       u8 tx_trace_loss[WL1271_INI_SUB_BAND_COUNT_5];
+       u8 rx_rssi_process_compens[WL1271_INI_RSSI_PROCESS_COMPENS_SIZE];
 -} __attribute__ ((packed));
++} __packed;
+ 
+ struct wl1271_ini_fem_params_5 {
+       __le16 tx_bip_ref_pd_voltage[WL1271_INI_SUB_BAND_COUNT_5];
+       u8 tx_bip_ref_power[WL1271_INI_SUB_BAND_COUNT_5];
+       u8 tx_bip_ref_offset[WL1271_INI_SUB_BAND_COUNT_5];
+       u8 tx_per_rate_pwr_limits_normal[WL1271_INI_RATE_GROUP_COUNT];
+       u8 tx_per_rate_pwr_limits_degraded[WL1271_INI_RATE_GROUP_COUNT];
+       u8 tx_per_rate_pwr_limits_extreme[WL1271_INI_RATE_GROUP_COUNT];
+       u8 tx_per_chan_pwr_limits_ofdm[WL1271_INI_CHANNEL_COUNT_5];
+       u8 tx_pd_vs_rate_offsets[WL1271_INI_RATE_GROUP_COUNT];
+       u8 tx_ibias[WL1271_INI_RATE_GROUP_COUNT];
+       u8 rx_fem_insertion_loss[WL1271_INI_SUB_BAND_COUNT_5];
+       u8 degraded_low_to_normal_thr;
+       u8 normal_to_degraded_high_thr;
 -} __attribute__ ((packed));
++} __packed;
+ 
+ 
+ /* NVS data structure */
+ #define WL1271_INI_NVS_SECTION_SIZE                468
+ #define WL1271_INI_FEM_MODULE_COUNT                  2
+ 
+ #define WL1271_INI_LEGACY_NVS_FILE_SIZE              800
+ 
+ struct wl1271_nvs_file {
+       /* NVS section */
+       u8 nvs[WL1271_INI_NVS_SECTION_SIZE];
+ 
+       /* INI section */
+       struct wl1271_ini_general_params general_params;
+       u8 padding1;
+       struct wl1271_ini_band_params_2 stat_radio_params_2;
+       u8 padding2;
+       struct {
+               struct wl1271_ini_fem_params_2 params;
+               u8 padding;
+       } dyn_radio_params_2[WL1271_INI_FEM_MODULE_COUNT];
+       struct wl1271_ini_band_params_5 stat_radio_params_5;
+       u8 padding3;
+       struct {
+               struct wl1271_ini_fem_params_5 params;
+               u8 padding;
+       } dyn_radio_params_5[WL1271_INI_FEM_MODULE_COUNT];
++} __packed;
+ 
+ #endif

diff --cc drivers/net/wireless/wl12xx/wl1271_tx.h
Simple merge

diff --cc include/net/cfg80211.h
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge