From: Reinette Chatre <[email protected]>
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 <[email protected]>
---
net/wireless/Kconfig | 13 -------------
net/wireless/Makefile | 3 +--
net/wireless/nl80211.h | 2 --
3 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index e28e2b8..8f779a2 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -10,19 +10,6 @@ config CFG80211_REG_DEBUG
If unsure, say N.
-config NL80211
- bool "nl80211 new netlink interface support"
- depends on CFG80211
- default y
- ---help---
- This option turns on the new netlink interface
- (nl80211) support in cfg80211.
-
- If =n, drivers using mac80211 will be configured via
- wireless extension support provided by that subsystem.
-
- If unsure, say Y.
-
config WIRELESS_OLD_REGULATORY
bool "Old wireless static regulatory definitions"
default y
diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index dad43c2..c157b4d 100644
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -5,8 +5,7 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
-cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o
-cfg80211-$(CONFIG_NL80211) += nl80211.o
ccflags-y += -D__CHECK_ENDIAN__
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h
index 69787b6..c9ca6c4 100644
--- 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 */
#endif /* __NET_WIRELESS_NL80211_H */
--
1.5.6.3
From: Reinette Chatre <[email protected]>
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 <[email protected]>
---
v2: neglected to notice the #else used in nl80211.h. Remove
inlines previously used when compiling without nl80211.
net/wireless/Kconfig | 13 -------------
net/wireless/Makefile | 3 +--
net/wireless/nl80211.h | 22 ----------------------
3 files changed, 1 insertions(+), 37 deletions(-)
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index e28e2b8..8f779a2 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -10,19 +10,6 @@ config CFG80211_REG_DEBUG
If unsure, say N.
-config NL80211
- bool "nl80211 new netlink interface support"
- depends on CFG80211
- default y
- ---help---
- This option turns on the new netlink interface
- (nl80211) support in cfg80211.
-
- If =n, drivers using mac80211 will be configured via
- wireless extension support provided by that subsystem.
-
- If unsure, say Y.
-
config WIRELESS_OLD_REGULATORY
bool "Old wireless static regulatory definitions"
default y
diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index dad43c2..c157b4d 100644
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -5,8 +5,7 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
-cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o
+cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o
cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o
-cfg80211-$(CONFIG_NL80211) += nl80211.o
ccflags-y += -D__CHECK_ENDIAN__
diff --git a/net/wireless/nl80211.h b/net/wireless/nl80211.h
index 69787b6..11a2e70 100644
--- 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);
@@ -11,26 +10,5 @@ extern void nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
struct net_device *netdev);
extern void nl80211_send_scan_aborted(struct cfg80211_registered_device *rdev,
struct net_device *netdev);
-#else
-static inline int nl80211_init(void)
-{
- return 0;
-}
-static inline void nl80211_exit(void)
-{
-}
-static inline void nl80211_notify_dev_rename(
- struct cfg80211_registered_device *rdev)
-{
-}
-static inline void
-nl80211_send_scan_done(struct cfg80211_registered_device *rdev,
- struct net_device *netdev)
-{}
-static inline void nl80211_send_scan_aborted(
- struct cfg80211_registered_device *rdev,
- struct net_device *netdev)
-{}
-#endif /* CONFIG_NL80211 */
#endif /* __NET_WIRELESS_NL80211_H */
--
1.5.6.3
On Wed, 2009-03-11 at 16:09 -0700, Reinette Chatre wrote:
> From: Reinette Chatre <[email protected]>
>
> 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 <[email protected]>
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