Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 91f26556ac23880ca98461d5fa9b1975f1688d18,c38ba7c9cfd4e76506d52b15a420905aaf091b13..fec0df016d68b1f3ef66d276c850752c87148465
--- 1/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
--- 2/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@@ -3086,11 -3112,9 +3112,9 @@@ static ssize_t rs_sta_dbgfs_scale_table
        struct iwl_lq_sta *lq_sta = file->private_data;
        struct iwl_priv *priv;
        char buf[64];
 -      int buf_size;
 +      size_t buf_size;
        u32 parsed_rate;
-       struct iwl_station_priv *sta_priv =
-               container_of(lq_sta, struct iwl_station_priv, lq_sta);
-       struct iwl_rxon_context *ctx = sta_priv->common.ctx;
+ 
  
        priv = lq_sta->drv;
        memset(buf, 0, sizeof(buf));