package/mac80211/patches/130-printk_debug_revert.patch

   1 --- a/include/net/cfg80211.h
   2 +++ b/include/net/cfg80211.h
   3 @@ -2574,9 +2574,8 @@ void cfg80211_cqm_rssi_notify(struct net
   4         wiphy_printk(KERN_NOTICE, wiphy, format, ##args)
   5  #define wiphy_info(wiphy, format, args...)                     \
   6         wiphy_printk(KERN_INFO, wiphy, format, ##args)
   7 -
   8 -int wiphy_debug(const struct wiphy *wiphy, const char *format, ...)
   9 -       __attribute__ ((format (printf, 2, 3)));
  10 +#define wiphy_debug(wiphy, format, args...)                    \
  11 +       wiphy_printk(KERN_DEBUG, wiphy, format, ##args)
  12
  13  #if defined(DEBUG)
  14  #define wiphy_dbg(wiphy, format, args...)                      \
  15 --- a/net/wireless/core.c
  16 +++ b/net/wireless/core.c
  17 @@ -929,52 +929,3 @@ static void __exit cfg80211_exit(void)
  18         destroy_workqueue(cfg80211_wq);
  19  }
  20  module_exit(cfg80211_exit);
  21 -
  22 -static int ___wiphy_printk(const char *level, const struct wiphy *wiphy,
  23 -                          struct va_format *vaf)
  24 -{
  25 -       if (!wiphy)
  26 -               return printk("%s(NULL wiphy *): %pV", level, vaf);
  27 -
  28 -       return printk("%s%s: %pV", level, wiphy_name(wiphy), vaf);
  29 -}
  30 -
  31 -int __wiphy_printk(const char *level, const struct wiphy *wiphy,
  32 -                  const char *fmt, ...)
  33 -{
  34 -       struct va_format vaf;
  35 -       va_list args;
  36 -       int r;
  37 -
  38 -       va_start(args, fmt);
  39 -
  40 -       vaf.fmt = fmt;
  41 -       vaf.va = &args;
  42 -
  43 -       r = ___wiphy_printk(level, wiphy, &vaf);
  44 -       va_end(args);
  45 -
  46 -       return r;
  47 -}
  48 -EXPORT_SYMBOL(__wiphy_printk);
  49 -
  50 -#define define_wiphy_printk_level(func, kern_level)            \
  51 -int func(const struct wiphy *wiphy, const char *fmt, ...)      \
  52 -{                                                              \
  53 -       struct va_format vaf;                                   \
  54 -       va_list args;                                           \
  55 -       int r;                                                  \
  56 -                                                               \
  57 -       va_start(args, fmt);                                    \
  58 -                                                               \
  59 -       vaf.fmt = fmt;                                          \
  60 -       vaf.va = &args;                                         \
  61 -                                                               \
  62 -       r = ___wiphy_printk(kern_level, wiphy, &vaf);           \
  63 -       va_end(args);                                           \
  64 -                                                               \
  65 -       return r;                                               \
  66 -}                                                              \
  67 -EXPORT_SYMBOL(func);
  68 -
  69 -define_wiphy_printk_level(wiphy_debug, KERN_DEBUG);