Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

[mirror_ubuntu-bionic-kernel.git] / net / wireless / chan.c

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index fad1b5baf8ff0e672419fd0d058ce0c7c8eb88b1..a48859982a32b14d2109082f5691d3eafded7811 100644 (file)
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -465,7 +465,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;
@@ -474,8 +474,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)