Attachment 622268 Details for Bug 770484 – iwlwifi-fix-6000-ch-switch.patch

iwlwifi-fix-6000-ch-switch.patch

iwlwifi-fix-6000-ch-switch.patch (text/plain), 2.87 KB, created by Stanislaw Gruszka on 2012-10-05 15:07:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2012-10-05 15:07:40 UTC

Size: 2.87 KB

patch

obsolete

>diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c b/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
>index 48533b3..37c3fa4 100644
>--- a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
>+++ b/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
>@@ -653,7 +653,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;
> 	const struct iwl_channel_info *ch_info;
> 	u32 switch_time_in_usec, ucode_switch_time;
> 	u16 ch;
>@@ -663,18 +663,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;
> 	/*
>@@ -690,30 +697,32 @@ 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->switch_time);
> 	ch_info = iwl_get_channel_info(priv, priv->band, ch);
> 	if (ch_info)
>-		cmd.expect_beacon = is_channel_radar(ch_info);
>+		cmd->expect_beacon = is_channel_radar(ch_info);
> 	else {
> 		IWL_ERR(priv, "invalid channel switch from %u to %u\n",
> 			ctx->active.channel, ch);
> 		return -EFAULT;
> 	}
> 
>-	return iwl_dvm_send_cmd(priv, &hcmd);
>+	err = iwl_dvm_send_cmd(priv, &hcmd);
>+	kfree(cmd);
>+	return err;
> }
> 
> struct iwl_lib_ops iwl6000_lib = {

Actions: View

Attachments on bug 770484: 622268