/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ #ifndef _NET_BATMAN_ADV_LOG_H_ #define _NET_BATMAN_ADV_LOG_H_ #include "main.h" #include #include #include #ifdef CONFIG_BATMAN_ADV_DEBUG int batadv_debug_log_setup(struct batadv_priv *bat_priv); void batadv_debug_log_cleanup(struct batadv_priv *bat_priv); #else static inline int batadv_debug_log_setup(struct batadv_priv *bat_priv) { return 0; } static inline void batadv_debug_log_cleanup(struct batadv_priv *bat_priv) { } #endif /** * enum batadv_dbg_level - available log levels * @BATADV_DBG_BATMAN: OGM and TQ computations related messages * @BATADV_DBG_ROUTES: route added / changed / deleted * @BATADV_DBG_TT: translation table messages * @BATADV_DBG_BLA: bridge loop avoidance messages * @BATADV_DBG_DAT: ARP snooping and DAT related messages * @BATADV_DBG_NC: network coding related messages * @BATADV_DBG_MCAST: multicast related messages * @BATADV_DBG_TP_METER: throughput meter messages * @BATADV_DBG_ALL: the union of all the above log levels */ enum batadv_dbg_level { BATADV_DBG_BATMAN = BIT(0), BATADV_DBG_ROUTES = BIT(1), BATADV_DBG_TT = BIT(2), BATADV_DBG_BLA = BIT(3), BATADV_DBG_DAT = BIT(4), BATADV_DBG_NC = BIT(5), BATADV_DBG_MCAST = BIT(6), BATADV_DBG_TP_METER = BIT(7), BATADV_DBG_ALL = 255, }; #ifdef CONFIG_BATMAN_ADV_DEBUG int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...) __printf(2, 3); /* possibly ratelimited debug output */ #define _batadv_dbg(type, bat_priv, ratelimited, fmt, arg...) \ do { \ if (atomic_read(&(bat_priv)->log_level) & (type) && \ (!(ratelimited) || net_ratelimit())) \ batadv_debug_log(bat_priv, fmt, ## arg); \ } \ while (0) #else /* !CONFIG_BATMAN_ADV_DEBUG */ __printf(4, 5) static inline void _batadv_dbg(int type __always_unused, struct batadv_priv *bat_priv __always_unused, int ratelimited __always_unused, const char *fmt __always_unused, ...) { } #endif #define batadv_dbg(type, bat_priv, arg...) \ _batadv_dbg(type, bat_priv, 0, ## arg) #define batadv_dbg_ratelimited(type, bat_priv, arg...) \ _batadv_dbg(type, bat_priv, 1, ## arg) #define batadv_info(net_dev, fmt, arg...) \ do { \ struct net_device *_netdev = (net_dev); \ struct batadv_priv *_batpriv = netdev_priv(_netdev); \ batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ pr_info("%s: " fmt, _netdev->name, ## arg); \ } while (0) #define batadv_err(net_dev, fmt, arg...) \ do { \ struct net_device *_netdev = (net_dev); \ struct batadv_priv *_batpriv = netdev_priv(_netdev); \ batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ pr_err("%s: " fmt, _netdev->name, ## arg); \ } while (0) #endif /* _NET_BATMAN_ADV_LOG_H_ */ l'>context:space:mode:
authorLuca Coelho <luciano.coelho@intel.com>2017-02-08 15:00:34 +0200
committerJohannes Berg <johannes.berg@intel.com>2017-02-09 15:17:30 +0100
commit8585989d146c61dd073d2135c5bb11d0f979d576 (patch)
tree23fee0893f93a3a65f5610cc0365aed5d081bc49 /net/wireless
parentbee427b86217b78a0a5fc85575cc155e4c32bbf9 (diff)
cfg80211: fix NAN bands definition
The nl80211_nan_dual_band_conf enumeration doesn't make much sense. The default value is assigned to a bit, which makes it weird if the default bit and other bits are set at the same time. To improve this, get rid of NL80211_NAN_BAND_DEFAULT and add a wiphy configuration to let the drivers define which bands are supported. This is exposed to the userspace, which then can make a decision on which band(s) to use. Additionally, rename all "dual_band" elements to "bands", to make things clearer. Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/core.c3
-rw-r--r--net/wireless/nl80211.c35
-rw-r--r--net/wireless/trace.h16
3 files changed, 37 insertions, 17 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c