95 lines
3.2 KiB
Diff
95 lines
3.2 KiB
Diff
commit a7d3a5d97acd4b8db17e1d5c3014357c9b2040f9
|
|
Author: Johannes Berg <johannes.berg@intel.com>
|
|
Date: Tue Sep 25 16:40:12 2012 +0200
|
|
|
|
iwlwifi: fix 6000 series channel switch command
|
|
|
|
The channel switch command for 6000 series devices
|
|
is larger than the maximum inline command size of
|
|
320 bytes. The command is therefore refused with a
|
|
warning. Fix this by allocating the command and
|
|
using the NOCOPY mechanism.
|
|
|
|
Cc: stable@kernel.org
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
|
|
diff --git a/drivers/net/wireless/iwlwifi/dvm/devices.c b/drivers/net/wireless/iwlwifi/dvm/devices.c
|
|
index 349c205..da58620 100644
|
|
--- a/drivers/net/wireless/iwlwifi/dvm/devices.c
|
|
+++ b/drivers/net/wireless/iwlwifi/dvm/devices.c
|
|
@@ -518,7 +518,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
|
|
* See iwlagn_mac_channel_switch.
|
|
*/
|
|
struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
|
|
- struct iwl6000_channel_switch_cmd cmd;
|
|
+ struct iwl6000_channel_switch_cmd *cmd;
|
|
u32 switch_time_in_usec, ucode_switch_time;
|
|
u16 ch;
|
|
u32 tsf_low;
|
|
@@ -527,18 +527,25 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
|
|
struct ieee80211_vif *vif = ctx->vif;
|
|
struct iwl_host_cmd hcmd = {
|
|
.id = REPLY_CHANNEL_SWITCH,
|
|
- .len = { sizeof(cmd), },
|
|
+ .len = { sizeof(*cmd), },
|
|
.flags = CMD_SYNC,
|
|
- .data = { &cmd, },
|
|
+ .dataflags[0] = IWL_HCMD_DFL_NOCOPY,
|
|
};
|
|
+ int err;
|
|
|
|
- cmd.band = priv->band == IEEE80211_BAND_2GHZ;
|
|
+ cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
|
|
+ if (!cmd)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ hcmd.data[0] = cmd;
|
|
+
|
|
+ cmd->band = priv->band == IEEE80211_BAND_2GHZ;
|
|
ch = ch_switch->channel->hw_value;
|
|
IWL_DEBUG_11H(priv, "channel switch from %u to %u\n",
|
|
ctx->active.channel, ch);
|
|
- cmd.channel = cpu_to_le16(ch);
|
|
- cmd.rxon_flags = ctx->staging.flags;
|
|
- cmd.rxon_filter_flags = ctx->staging.filter_flags;
|
|
+ cmd->channel = cpu_to_le16(ch);
|
|
+ cmd->rxon_flags = ctx->staging.flags;
|
|
+ cmd->rxon_filter_flags = ctx->staging.filter_flags;
|
|
switch_count = ch_switch->count;
|
|
tsf_low = ch_switch->timestamp & 0x0ffffffff;
|
|
/*
|
|
@@ -554,23 +561,25 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
|
|
switch_count = 0;
|
|
}
|
|
if (switch_count <= 1)
|
|
- cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);
|
|
+ cmd->switch_time = cpu_to_le32(priv->ucode_beacon_time);
|
|
else {
|
|
switch_time_in_usec =
|
|
vif->bss_conf.beacon_int * switch_count * TIME_UNIT;
|
|
ucode_switch_time = iwl_usecs_to_beacons(priv,
|
|
switch_time_in_usec,
|
|
beacon_interval);
|
|
- cmd.switch_time = iwl_add_beacon_time(priv,
|
|
- priv->ucode_beacon_time,
|
|
- ucode_switch_time,
|
|
- beacon_interval);
|
|
+ cmd->switch_time = iwl_add_beacon_time(priv,
|
|
+ priv->ucode_beacon_time,
|
|
+ ucode_switch_time,
|
|
+ beacon_interval);
|
|
}
|
|
IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",
|
|
- cmd.switch_time);
|
|
- cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
|
|
+ cmd->switch_time);
|
|
+ cmd->expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR;
|
|
|
|
- return iwl_dvm_send_cmd(priv, &hcmd);
|
|
+ err = iwl_dvm_send_cmd(priv, &hcmd);
|
|
+ kfree(cmd);
|
|
+ return err;
|
|
}
|
|
|
|
struct iwl_lib_ops iwl6000_lib = {
|