[PATCH] cfg80211: remove spurious __KERNEL__ ifdef

[PATCH] cfg80211: remove spurious __KERNEL__ ifdef

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

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>
---
Might be something that slipped in elsewhere too?

 include/net/cfg80211.h |    4 ----
 1 file changed, 4 deletions(-)

--- wireless-testing.orig/include/net/cfg80211.h	2010-09-30 21:18:46.000000000 +0200
+++ wireless-testing/include/net/cfg80211.h	2010-09-30 21:18:51.000000000 +0200
@@ -2551,8 +2551,6 @@ void cfg80211_cqm_rssi_notify(struct net
 			      enum nl80211_cqm_rssi_threshold_event rssi_event,
 			      gfp_t gfp);
 
-#ifdef __KERNEL__
-
 /* Logging, debugging and troubleshooting/diagnostic helpers. */
 
 /* wiphy_printk helpers, similar to dev_printk */
@@ -2599,6 +2597,4 @@ void cfg80211_cqm_rssi_notify(struct net
 #define wiphy_WARN(wiphy, format, args...)			\
 	WARN(1, "wiphy: %s\n" format, wiphy_name(wiphy), ##args);
 
-#endif
-
 #endif /* __NET_CFG80211_H */

Re: [PATCH] cfg80211: remove spurious __KERNEL__ ifdef

[Joe Perches]

On Thu, 2010-09-30 at 21:21 +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> 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>
> ---
> Might be something that slipped in elsewhere too?

I thought John was going to remove that guard.

http://lkml.org/lkml/2010/7/27/294

I believe John removed the other one.

Re: [PATCH] cfg80211: remove spurious __KERNEL__ ifdef

[John W. Linville]

On Thu, Sep 30, 2010 at 12:36:57PM -0700, Joe Perches wrote:
> On Thu, 2010-09-30 at 21:21 +0200, Johannes Berg wrote:
> > From: Johannes Berg <johannes.berg@intel.com>
> > 
> > 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>
> > ---
> > Might be something that slipped in elsewhere too?
> 
> I thought John was going to remove that guard.
> 
> http://lkml.org/lkml/2010/7/27/294
> 
> I believe John removed the other one.

Sorry, I must have forgotten... :-(

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.