diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-10-25 11:57:35 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-10-29 13:42:51 -0400 |
commit | dcc6c2f5165788fdc37be9a13a909e8c16f254ce (patch) | |
tree | 72f8bd67cea8e98437ba08d55dd121fa11a644ad /net | |
parent | 4f86ed8f87c07b3e1c1291bbb262c8de7e7f1233 (diff) |
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')
-rw-r--r-- | net/wireless/nl80211.c | 5 |
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) | |||
6038 | * function is called under RTNL lock, so this should not be a problem. | 6038 | * function is called under RTNL lock, so this should not be a problem. |
6039 | */ | 6039 | */ |
6040 | static struct nlattr *csa_attrs[NL80211_ATTR_MAX+1]; | 6040 | static struct nlattr *csa_attrs[NL80211_ATTR_MAX+1]; |
6041 | u8 radar_detect_width = 0; | ||
6042 | int err; | 6041 | int err; |
6043 | bool need_new_beacon = false; | 6042 | bool need_new_beacon = false; |
6044 | int len, i; | 6043 | int len, i; |
@@ -6174,10 +6173,8 @@ skip_beacons: | |||
6174 | if (err < 0) | 6173 | if (err < 0) |
6175 | return err; | 6174 | return err; |
6176 | 6175 | ||
6177 | if (err > 0) { | 6176 | if (err > 0) |
6178 | radar_detect_width = BIT(params.chandef.width); | ||
6179 | params.radar_required = true; | 6177 | params.radar_required = true; |
6180 | } | ||
6181 | 6178 | ||
6182 | if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX]) | 6179 | if (info->attrs[NL80211_ATTR_CH_SWITCH_BLOCK_TX]) |
6183 | params.block_tx = true; | 6180 | params.block_tx = true; |