summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-10-25 17:57:35 +0200
committerJohannes Berg <johannes.berg@intel.com>2014-10-29 18:42:51 +0100
commitdcc6c2f5165788fdc37be9a13a909e8c16f254ce (patch)
tree72f8bd67cea8e98437ba08d55dd121fa11a644ad /net/wireless
parent4f86ed8f87c07b3e1c1291bbb262c8de7e7f1233 (diff)
downloadlinux-dcc6c2f5165788fdc37be9a13a909e8c16f254ce.tar.gz
linux-dcc6c2f5165788fdc37be9a13a909e8c16f254ce.tar.bz2
linux-dcc6c2f5165788fdc37be9a13a909e8c16f254ce.zip
cfg80211: fix set but not used warning in nl80211_channel_switch()
radar_detect_width is unused since commit 97dc94f1d933 ("cfg80211: remove channel_switch combination check") Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 12736a7cd506..33aff7466f2f 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -6038,7 +6038,6 @@ static int nl80211_channel_switch(struct sk_buff *skb, struct genl_info *info)
* function is called under RTNL lock, so this should not be a problem.
*/
static struct nlattr *csa_attrs[NL80211_ATTR_MAX+1];
- u8 radar_detect_width = 0;
int err;
bool need_new_beacon = false;
int len, i;
@@ -6174,10 +6173,8 @@ skip_beacons:
if (err < 0)
return err;
- if (err > 0) {
- radar_detect_width = BIT(params.chandef.width);
+ if (err > 0)
params.radar_required = true;
- }
if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX])
params.block_tx = true;