Re: [PATCH] cfg80211/nl80211: remove usage of CONFIG_NL80211

[Johannes Berg <johannes@sipsolutions.net>]

[-- Attachment #1: Type: text/plain, Size: 1284 bytes --]

On Wed, 2009-03-11 at 16:09 -0700, Reinette Chatre wrote:
> From: Reinette Chatre <reinette.chatre@intel.com>
> 
> The scan capability added to cfg80211/nl80211 introduced a
> dependency on nl80211 by cfg80211. We can thus no longer have
> just cfg80211 without nl80211. Specifically, cfg80211_scan_done()
> calls nl80211_send_scan_aborted() or nl80211_send_scan_done().
> 
> Now we remove the option for user to select nl80211. It will always
> be compiled if user selects cfg80211.
> 
> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>

I agree, it's quite pointless to make this configurable, and we keep
breaking it like in this case.

> --- a/net/wireless/nl80211.h
> +++ b/net/wireless/nl80211.h
> @@ -3,7 +3,6 @@
>  
>  #include "core.h"
>  
> -#ifdef CONFIG_NL80211
>  extern int nl80211_init(void);
>  extern void nl80211_exit(void);
>  extern void nl80211_notify_dev_rename(struct cfg80211_registered_device *rdev);
> @@ -31,6 +30,5 @@ static inline void nl80211_send_scan_aborted(
>  					struct cfg80211_registered_device *rdev,
>  					struct net_device *netdev)
>  {}
> -#endif /* CONFIG_NL80211 */

This doesn't seem quite right though, there's an #else with inlines in
the file which we need to remove entirely.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]