diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2018-08-16 09:15:12 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2018-08-16 09:48:24 +0200 |
commit | 85e6ac468efc980ef89149dcbab23e492ece8e97 (patch) | |
tree | a4b6c0c5452d1eed5e6001ccc4bf9b7d34dd6e31 /package/kernel/mac80211/patches/318-v4.11-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch | |
parent | d3b8b5be3455d734e5681f98f22e5705dfe02ba4 (diff) | |
download | upstream-85e6ac468efc980ef89149dcbab23e492ece8e97.tar.gz upstream-85e6ac468efc980ef89149dcbab23e492ece8e97.tar.bz2 upstream-85e6ac468efc980ef89149dcbab23e492ece8e97.zip |
mac80211: brcmfmac: group 4.11 backport patches
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/318-v4.11-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch')
-rw-r--r-- | package/kernel/mac80211/patches/318-v4.11-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/318-v4.11-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch b/package/kernel/mac80211/patches/318-v4.11-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch new file mode 100644 index 0000000000..3aaddb800d --- /dev/null +++ b/package/kernel/mac80211/patches/318-v4.11-0006-brcmfmac-merge-two-remaining-brcmf_err-macros.patch @@ -0,0 +1,46 @@ +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) |