diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-07 20:07:11 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-07 20:07:11 +0200 |
| commit | 41bfce8edebbe9dc6ddc238a71f07fbe9ab46016 (patch) | |
| tree | 31e1799bdb73dd5b7bc5aea367cc6fead035e396 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
| parent | iwlagn: call commit_rxon function directly (diff) | |
| parent | iwl4965: set tx power after rxon_assoc (diff) | |
| download | linux-41bfce8edebbe9dc6ddc238a71f07fbe9ab46016.tar.xz linux-41bfce8edebbe9dc6ddc238a71f07fbe9ab46016.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index a8dbbd08279d..4353a658de25 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -331,8 +331,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, ctx->active.channel, ch); return -EFAULT; } - priv->switch_rxon.channel = cmd.channel; - priv->switch_rxon.switch_in_progress = true; return iwl_send_cmd_sync(priv, &hcmd); } @@ -423,7 +421,6 @@ static struct iwl_base_params iwl5000_base_params = { }; static struct iwl_ht_params iwl5000_ht_params = { .ht_greenfield_support = true, - .use_rts_for_aggregation = true, /* use rts/cts protection */ }; #define IWL_DEVICE_5000 \ |