From d9328674575cc4da595d5b7f12902c2b00822240 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 16 May 2012 16:37:57 +0200 Subject: [PATCH] --- yaml --- r: 314215 b: refs/heads/master c: cc66880ba58ef6b9ee645fa1e1c074746ff03ce4 h: refs/heads/master i: 314213: 60a9053fe68c14f1331a561c4199b4c6c58948c2 314211: 140ad4bd45798fc8ee9d31ceaf115281fc642580 314207: 1c570963dd9c809214ffe34e84f116cb8735bda8 v: v3 --- [refs] | 2 +- .../net/wireless/iwlwifi/iwl-agn-devices.c | 20 ++----------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index d1d042796dc3..aea279372171 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9b9d940ac2d1c03ec955dc921dd12e432a64e5c +refs/heads/master: cc66880ba58ef6b9ee645fa1e1c074746ff03ce4 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-devices.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-devices.c index 48533b3a0f9a..529cdac6f739 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-devices.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-devices.c @@ -455,7 +455,6 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, */ struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; struct iwl5000_channel_switch_cmd cmd; - const struct iwl_channel_info *ch_info; u32 switch_time_in_usec, ucode_switch_time; u16 ch; u32 tsf_low; @@ -505,14 +504,7 @@ static int iwl5000_hw_channel_switch(struct iwl_priv *priv, } IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n", cmd.switch_time); - ch_info = iwl_get_channel_info(priv, priv->band, ch); - if (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; - } + cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR; return iwl_dvm_send_cmd(priv, &hcmd); } @@ -654,7 +646,6 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, */ struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS]; struct iwl6000_channel_switch_cmd cmd; - const struct iwl_channel_info *ch_info; u32 switch_time_in_usec, ucode_switch_time; u16 ch; u32 tsf_low; @@ -704,14 +695,7 @@ static int iwl6000_hw_channel_switch(struct iwl_priv *priv, } IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n", cmd.switch_time); - ch_info = iwl_get_channel_info(priv, priv->band, ch); - if (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; - } + cmd.expect_beacon = ch_switch->channel->flags & IEEE80211_CHAN_RADAR; return iwl_dvm_send_cmd(priv, &hcmd); }