+From 0f83ff69735651cc7a3d150466a5257ff829b62b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Subject: [PATCH] brcmfmac: use wiphy_read_of_freq_limits
+Date: Tue, 17 Jan 2017 23:35:50 +0100
+Subject: [PATCH] brcmfmac: use wiphy_read_of_freq_limits to respect limits
+ from DT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
+This new helper reads extra frequency limits specified in DT and
+disables unavailable chanels. This is useful for devices (like home
+routers) with chipsets limited e.g. by board design.
+
+In order to respect info read from DT we simply need to check for
+IEEE80211_CHAN_DISABLED bit when constructing channel info.
+
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--- /dev/null
+From 9587a01a7ead9efc5032c16e0d9668de58be1186 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 2 Feb 2017 22:33:13 +0100
+Subject: [PATCH] brcmfmac: merge two brcmf_err macros into one
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This allows simplifying the code by adding a simple IS_ENABLED check for
+CONFIG_BRCMDB symbol.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+@@ -45,20 +45,16 @@
+ #undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
++#ifndef CPTCFG_BRCM_TRACING
+ /* Macro for error messages. net_ratelimit() is used when driver
+ * debugging is not selected. When debugging the driver error
+ * messages are as important as other tracing or even more so.
+ */
+-#ifndef CPTCFG_BRCM_TRACING
+-#ifdef CPTCFG_BRCMDBG
+-#define brcmf_err(fmt, ...) pr_err("%s: " fmt, __func__, ##__VA_ARGS__)
+-#else
+ #define brcmf_err(fmt, ...) \
+ do { \
+- if (net_ratelimit()) \
++ if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit()) \
+ pr_err("%s: " fmt, __func__, ##__VA_ARGS__); \
+ } while (0)
+-#endif
+ #else
+ __printf(2, 3)
+ void __brcmf_err(const char *func, const char *fmt, ...);
--- /dev/null
+From 087fa712a00685dac4bcc64b7c3dc8ae6bee8026 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 2 Feb 2017 22:33:14 +0100
+Subject: [PATCH] brcmfmac: switch to C function (__brcmf_err) for printing
+ errors
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This will allow extending code and using more detailed messages e.g.
+with the help of dev_err.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ .../net/wireless/broadcom/brcm80211/brcmfmac/common.c | 16 ++++++++++++++++
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 6 +++---
+ 2 files changed, 19 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+@@ -218,6 +218,22 @@ done:
+ return err;
+ }
+
++#ifndef CPTCFG_BRCM_TRACING
++void __brcmf_err(const char *func, const char *fmt, ...)
++{
++ struct va_format vaf;
++ va_list args;
++
++ va_start(args, fmt);
++
++ vaf.fmt = fmt;
++ vaf.va = &args;
++ pr_err("%s: %pV", func, &vaf);
++
++ va_end(args);
++}
++#endif
++
+ #if defined(CPTCFG_BRCM_TRACING) || defined(CPTCFG_BRCMDBG)
+ void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)
+ {
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+@@ -45,6 +45,8 @@
+ #undef pr_fmt
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
++__printf(2, 3)
++void __brcmf_err(const char *func, const char *fmt, ...);
+ #ifndef CPTCFG_BRCM_TRACING
+ /* Macro for error messages. net_ratelimit() is used when driver
+ * debugging is not selected. When debugging the driver error
+@@ -53,11 +55,9 @@
+ #define brcmf_err(fmt, ...) \
+ do { \
+ if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit()) \
+- pr_err("%s: " fmt, __func__, ##__VA_ARGS__); \
++ __brcmf_err(__func__, fmt, ##__VA_ARGS__); \
+ } while (0)
+ #else
+-__printf(2, 3)
+-void __brcmf_err(const char *func, const char *fmt, ...);
+ #define brcmf_err(fmt, ...) \
+ __brcmf_err(__func__, fmt, ##__VA_ARGS__)
+ #endif
--- /dev/null
+From d0630555650a394cf5743268820511f527a561a5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 2 Feb 2017 22:33:15 +0100
+Subject: [PATCH] brcmfmac: merge two remaining brcmf_err macros
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Now we always have __brcmf_err function we can do perfectly fine with
+just one macro.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+@@ -47,20 +47,16 @@
+
+ __printf(2, 3)
+ void __brcmf_err(const char *func, const char *fmt, ...);
+-#ifndef CPTCFG_BRCM_TRACING
+-/* Macro for error messages. net_ratelimit() is used when driver
+- * debugging is not selected. When debugging the driver error
+- * messages are as important as other tracing or even more so.
++/* Macro for error messages. When debugging / tracing the driver all error
++ * messages are important to us.
+ */
+ #define brcmf_err(fmt, ...) \
+ do { \
+- if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit()) \
++ if (IS_ENABLED(CPTCFG_BRCMDBG) || \
++ IS_ENABLED(CPTCFG_BRCM_TRACING) || \
++ net_ratelimit()) \
+ __brcmf_err(__func__, fmt, ##__VA_ARGS__); \
+ } while (0)
+-#else
+-#define brcmf_err(fmt, ...) \
+- __brcmf_err(__func__, fmt, ##__VA_ARGS__)
+-#endif
+
+ #if defined(DEBUG) || defined(CPTCFG_BRCM_TRACING)
+ __printf(3, 4)
projects / thirdparty / openwrt.git / commitdiff
