aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-09-30 15:21:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-10-05 13:35:23 -0400
commitea229e682633a18c1fa2c408400a6923cfc47910 (patch)
treedb12c45737152b7aae91f05f3d1013057ea61563
parent663fcafd977f13e6483f7d4cf2ccdbc4fae81ed0 (diff)
cfg80211: remove spurious __KERNEL__ ifdef
The net/cfg80211.h header file isn't exported to userspace, so there's no need for any kind of __KERNEL__ protection in it. If it was exported, everything else in it would need protection as well, not just the logging stuff ... Cc:Joe Perches <joe@perches.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--include/net/cfg80211.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index ecc0403b918a..5f4d8acf7abb 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2553,8 +2553,6 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev,
2553 enum nl80211_cqm_rssi_threshold_event rssi_event, 2553 enum nl80211_cqm_rssi_threshold_event rssi_event,
2554 gfp_t gfp); 2554 gfp_t gfp);
2555 2555
2556#ifdef __KERNEL__
2557
2558/* Logging, debugging and troubleshooting/diagnostic helpers. */ 2556/* Logging, debugging and troubleshooting/diagnostic helpers. */
2559 2557
2560/* wiphy_printk helpers, similar to dev_printk */ 2558/* wiphy_printk helpers, similar to dev_printk */
@@ -2601,6 +2599,4 @@ void cfg80211_cqm_rssi_notify(struct net_device *dev,
2601#define wiphy_WARN(wiphy, format, args...) \ 2599#define wiphy_WARN(wiphy, format, args...) \
2602 WARN(1, "wiphy: %s\n" format, wiphy_name(wiphy), ##args); 2600 WARN(1, "wiphy: %s\n" format, wiphy_name(wiphy), ##args);
2603 2601
2604#endif
2605
2606#endif /* __NET_CFG80211_H */ 2602#endif /* __NET_CFG80211_H */