aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/347-0001-cfg80211-move-function-checking-range-fit-to-util.c.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/kernel/mac80211/patches/347-0001-cfg80211-move-function-checking-range-fit-to-util.c.patch')
-rw-r--r--package/kernel/mac80211/patches/347-0001-cfg80211-move-function-checking-range-fit-to-util.c.patch101
1 files changed, 101 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/347-0001-cfg80211-move-function-checking-range-fit-to-util.c.patch b/package/kernel/mac80211/patches/347-0001-cfg80211-move-function-checking-range-fit-to-util.c.patch
new file mode 100644
index 0000000000..4a50d37b2e
--- /dev/null
+++ b/package/kernel/mac80211/patches/347-0001-cfg80211-move-function-checking-range-fit-to-util.c.patch
@@ -0,0 +1,101 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Wed, 4 Jan 2017 18:58:30 +0100
+Subject: [PATCH] cfg80211: move function checking range fit to util.c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It is needed for another cfg80211 helper that will be out of reg.c so
+move it to common util.c file and make it non-static.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+---
+
+--- a/net/wireless/core.h
++++ b/net/wireless/core.h
+@@ -429,6 +429,9 @@ int cfg80211_change_iface(struct cfg8021
+ void cfg80211_process_rdev_events(struct cfg80211_registered_device *rdev);
+ void cfg80211_process_wdev_events(struct wireless_dev *wdev);
+
++bool cfg80211_does_bw_fit_range(const struct ieee80211_freq_range *freq_range,
++ u32 center_freq_khz, u32 bw_khz);
++
+ /**
+ * cfg80211_chandef_dfs_usable - checks if chandef is DFS usable
+ * @wiphy: the wiphy to validate against
+--- a/net/wireless/reg.c
++++ b/net/wireless/reg.c
+@@ -748,21 +748,6 @@ static bool is_valid_rd(const struct iee
+ return true;
+ }
+
+-static bool reg_does_bw_fit(const struct ieee80211_freq_range *freq_range,
+- u32 center_freq_khz, u32 bw_khz)
+-{
+- u32 start_freq_khz, end_freq_khz;
+-
+- start_freq_khz = center_freq_khz - (bw_khz/2);
+- end_freq_khz = center_freq_khz + (bw_khz/2);
+-
+- if (start_freq_khz >= freq_range->start_freq_khz &&
+- end_freq_khz <= freq_range->end_freq_khz)
+- return true;
+-
+- return false;
+-}
+-
+ /**
+ * freq_in_rule_band - tells us if a frequency is in a frequency band
+ * @freq_range: frequency rule we want to query
+@@ -1070,7 +1055,7 @@ freq_reg_info_regd(u32 center_freq,
+ if (!band_rule_found)
+ band_rule_found = freq_in_rule_band(fr, center_freq);
+
+- bw_fits = reg_does_bw_fit(fr, center_freq, bw);
++ bw_fits = cfg80211_does_bw_fit_range(fr, center_freq, bw);
+
+ if (band_rule_found && bw_fits)
+ return rr;
+@@ -1138,11 +1123,13 @@ static uint32_t reg_rule_to_chan_bw_flag
+ max_bandwidth_khz = reg_get_max_bandwidth(regd, reg_rule);
+
+ /* If we get a reg_rule we can assume that at least 5Mhz fit */
+- if (!reg_does_bw_fit(freq_range, MHZ_TO_KHZ(chan->center_freq),
+- MHZ_TO_KHZ(10)))
++ if (!cfg80211_does_bw_fit_range(freq_range,
++ MHZ_TO_KHZ(chan->center_freq),
++ MHZ_TO_KHZ(10)))
+ bw_flags |= IEEE80211_CHAN_NO_10MHZ;
+- if (!reg_does_bw_fit(freq_range, MHZ_TO_KHZ(chan->center_freq),
+- MHZ_TO_KHZ(20)))
++ if (!cfg80211_does_bw_fit_range(freq_range,
++ MHZ_TO_KHZ(chan->center_freq),
++ MHZ_TO_KHZ(20)))
+ bw_flags |= IEEE80211_CHAN_NO_20MHZ;
+
+ if (max_bandwidth_khz < MHZ_TO_KHZ(10))
+--- a/net/wireless/util.c
++++ b/net/wireless/util.c
+@@ -1788,6 +1788,21 @@ void cfg80211_free_nan_func(struct cfg80
+ }
+ EXPORT_SYMBOL(cfg80211_free_nan_func);
+
++bool cfg80211_does_bw_fit_range(const struct ieee80211_freq_range *freq_range,
++ u32 center_freq_khz, u32 bw_khz)
++{
++ u32 start_freq_khz, end_freq_khz;
++
++ start_freq_khz = center_freq_khz - (bw_khz / 2);
++ end_freq_khz = center_freq_khz + (bw_khz / 2);
++
++ if (start_freq_khz >= freq_range->start_freq_khz &&
++ end_freq_khz <= freq_range->end_freq_khz)
++ return true;
++
++ return false;
++}
++
+ /* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
+ /* Ethernet-II snap header (RFC1042 for most EtherTypes) */
+ const unsigned char rfc1042_header[] __aligned(2) =