From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 16 May 2011 18:21:02 +0000 (-0400)
Subject: Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0-rc1~147^2~12^2^2~46
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f51f87a09119a495527a3f15d76db38b8e24beb8;p=~shefty%2Frdma-dev.git

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

f51f87a09119a495527a3f15d76db38b8e24beb8
diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index 91f26556ac2,c38ba7c9cfd..fec0df016d6
--- a/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));