diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:55:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-16 19:32:19 -0400 |
| commit | e00cf3b9eb7839b952e434a75bff6b99e47337ac (patch) | |
| tree | ef583ab8ac09bf703026650d4bc7777e6a3864d3 /drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |
| parent | 1a8218e96271790a07dd7065a2ef173e0f67e328 (diff) | |
| parent | 3b8ab88acaceb505aa06ef3bbf3a73b92470ae78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/mac80211/sta_info.h
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rs.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index dbe6295bbf23..91f26556ac23 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
| @@ -3086,7 +3086,7 @@ static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file, | |||
| 3086 | struct iwl_lq_sta *lq_sta = file->private_data; | 3086 | struct iwl_lq_sta *lq_sta = file->private_data; |
| 3087 | struct iwl_priv *priv; | 3087 | struct iwl_priv *priv; |
| 3088 | char buf[64]; | 3088 | char buf[64]; |
| 3089 | int buf_size; | 3089 | size_t buf_size; |
| 3090 | u32 parsed_rate; | 3090 | u32 parsed_rate; |
| 3091 | struct iwl_station_priv *sta_priv = | 3091 | struct iwl_station_priv *sta_priv = |
| 3092 | container_of(lq_sta, struct iwl_station_priv, lq_sta); | 3092 | container_of(lq_sta, struct iwl_station_priv, lq_sta); |