diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2017-10-18 18:40:18 +0300 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2017-10-18 18:40:18 +0300 |
| commit | 396665e8320987ff43b20a62a6a1cdae57aa1cc1 (patch) | |
| tree | bf778eab1ef1c9ff102bb235d9bca1a42bec7d0a /net/wireless/chan.c | |
| parent | d01174fcd2c1ffefdd0554f847c4045a5c731591 (diff) | |
| parent | b9f1f1ce866c28e3d9b86202441b220244754a69 (diff) | |
| download | linux-396665e8320987ff43b20a62a6a1cdae57aa1cc1.tar.xz | |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'net/wireless/chan.c')
| -rw-r--r-- | net/wireless/chan.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/wireless/chan.c b/net/wireless/chan.c index b8aa5a7d5c77..eb824270f6e3 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -464,7 +464,7 @@ bool cfg80211_is_sub_chan(struct cfg80211_chan_def *chandef, struct ieee80211_channel *chan) { int width; - u32 cf_offset, freq; + u32 freq; if (chandef->chan->center_freq == chan->center_freq) return true; @@ -473,8 +473,6 @@ bool cfg80211_is_sub_chan(struct cfg80211_chan_def *chandef, if (width <= 20) return false; - cf_offset = width / 2 - 10; - for (freq = chandef->center_freq1 - width / 2 + 10; freq <= chandef->center_freq1 + width / 2 - 10; freq += 20) { if (chan->center_freq == freq) |