Skip to contentSkip to conversation

Use better examples for MadWifi path in defconfig, clarify comments

PATCH Applied Pavel Roskin 3 participants 7 messages Feb 4, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Use better examples for MadWifi path in defconfig, clarify comments

MadWifi is unlikely to be in ../head relative to hostapd or wpa_supplicant, as it would be inside the hostap git repository. MadWifi sources are more likely to be in a directory called "madwifi" and residing outside the hostap repository. Using "madwifi" also demonstrates that the top-level madwifi directory is needed.

---
 hostapd/defconfig        |    2 +-
 wpa_supplicant/defconfig |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
hostapd/defconfig +1 -1
index 2591e71..45078f2 100644
@@ -17,7 +17,7 @@ CONFIG_DRIVER_HOSTAP=y
 
 # Driver interface for madwifi driver
 #CONFIG_DRIVER_MADWIFI=y
-#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src
+#CFLAGS += -I../../madwifi # change to the madwifi source directory
 
 # Driver interface for Prism54 driver
 #CONFIG_DRIVER_PRISM54=y
wpa_supplicant/defconfig +2 -2
index 2c66f9c..7a28e6f 100644
@@ -51,8 +51,8 @@ CONFIG_DRIVER_HOSTAP=y
 
 # Driver interface for madwifi driver
 #CONFIG_DRIVER_MADWIFI=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../madwifi/wpa
+# Set include directory to the madwifi source tree
+#CFLAGS += -I../../madwifi
 
 # Driver interface for Prism54 driver
 # (Note: Prism54 is not yet supported, i.e., this will not work as-is and is
#1 lore raw

PATCH 2/2 Document CONFIG_DRIVER_NL80211 in wpa_supplicant/defconfig

Put it after CONFIG_DRIVER_WEXT, as it's the new Linux wireless API. Move comments about kernel includes next to CONFIG_DRIVER_NL80211, away from CONFIG_CLIENT_MLME.

---
 wpa_supplicant/defconfig |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
wpa_supplicant/defconfig +10 -8
index 7a28e6f..b95ea50 100644
@@ -82,6 +82,15 @@ CONFIG_DRIVER_ATMEL=y
 # Driver interface for generic Linux wireless extensions
 CONFIG_DRIVER_WEXT=y
 
+# Driver interface for Linux drivers using the nl80211 kernel interface
+#CONFIG_DRIVER_NL80211=y
+# Currently, driver_nl80211.c build requires some additional parameters to be
+# able to include some of the kernel header files. Following lines can be used
+# to set these (WIRELESS_DEV must point to the root directory of the
+# wireless-testing.git tree).
+#WIRELESS_DEV=/usr/src/wireless-testing
+#CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
+
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y
 #CFLAGS += -I/usr/local/include
@@ -360,15 +369,8 @@ CONFIG_PEERKEY=y
 
 # Include client MLME (management frame processing).
 # This can be used to move MLME processing of Linux mac80211 stack into user
-# space.
+# space.  mac80211 may need external patches to enable userspace MLME support.
 #CONFIG_CLIENT_MLME=y
-# Currently, driver_nl80211.c build requires some additional parameters to be
-# able to include some of the kernel header files. Following lines can be used
-# to set these (WIRELESS_DEV must point to the root directory of the
-# wireless-testing.git tree). In addition, mac80211 may need external patches
-# to enable userspace MLME support.
-#WIRELESS_DEV=/usr/src/wireless-testing
-#CFLAGS += -I$(WIRELESS_DEV)/net/mac80211
 
 # IEEE Std 802.11r-2008 (Fast BSS Transition)
 #CONFIG_IEEE80211R=y
#2 lore raw

Re: [PATCH 2/2] Document CONFIG_DRIVER_NL80211 in wpa_supplicant/defconfig

Quoted 3 lines · Pavel Roskin

Put it after CONFIG_DRIVER_WEXT, as it's the new Linux wireless API. Move comments about kernel includes next to CONFIG_DRIVER_NL80211, away from CONFIG_CLIENT_MLME.

Eh, no? The kernel includes are not required for nl80211 if everything is set up correctly, or maybe for client mlme only?

johannes

#3 lore raw

Re: [PATCH 2/2] Document CONFIG_DRIVER_NL80211 in wpa_supplicant/defconfig

Quoting Johannes Berg <[email protected]>:

Quoted 7 lines · Pavel Roskin
Quoted 3 lines

Put it after CONFIG_DRIVER_WEXT, as it's the new Linux wireless API. Move comments about kernel includes next to CONFIG_DRIVER_NL80211, away from CONFIG_CLIENT_MLME.

Eh, no? The kernel includes are not required for nl80211 if everything is set up correctly, or maybe for client mlme only?

You are right, it looks like new kernel headers are no longer needed. The only header from the kernel is linux/if_ether.h, but it has been in the kernel for a long time.

Then let's add CONFIG_DRIVER_NL80211 (maybe even enabled by default) and remove the comments after CONFIG_CLIENT_MLME.

Signature · 2 lines
Regards,
Pavel Roskin
#6 lore raw
In reply to Pavel Roskin
Quoted 8 lines · Pavel Roskin

MadWifi is unlikely to be in ../head relative to hostapd or wpa_supplicant, as it would be inside the hostap git repository. MadWifi sources are more likely to be in a directory called "madwifi" and residing outside the hostap repository. Using "madwifi" also demonstrates that the top-level madwifi directory is needed.

 hostapd/defconfig        |    2 +-
 wpa_supplicant/defconfig |    4 ++--

Thanks, applied.

Signature · 1 line
Jouni Malinen                                            PGP id EFC895FA
#4 lore raw

Re: [PATCH 2/2] Document CONFIG_DRIVER_NL80211 in wpa_supplicant/defconfig

In reply to Pavel Roskin
Quoted 3 lines · Pavel Roskin

Put it after CONFIG_DRIVER_WEXT, as it's the new Linux wireless API. Move comments about kernel includes next to CONFIG_DRIVER_NL80211, away from CONFIG_CLIENT_MLME.

Thanks. CONFIG_DRIVER_NL80211 part applied as-is; the WIRELESS_DEV comment was removed since it does not apply anymore. CONFIG_DRIVER_NL80211 was missing by design since the driver_nl80211.c code was not yet complete. Anyway, it is now functional enough to be included in wpa_supplicant defconfig. Though, I did leave it commented out for the time being.

Signature · 1 line
Jouni Malinen                                            PGP id EFC895FA
#5 lore raw

Re: [PATCH 2/2] Document CONFIG_DRIVER_NL80211 in wpa_supplicant/defconfig

Quoted 11 lines · Jouni Malinen
Quoted 3 lines · Pavel Roskin

Put it after CONFIG_DRIVER_WEXT, as it's the new Linux wireless API. Move comments about kernel includes next to CONFIG_DRIVER_NL80211, away from CONFIG_CLIENT_MLME.

Thanks. CONFIG_DRIVER_NL80211 part applied as-is; the WIRELESS_DEV comment was removed since it does not apply anymore. CONFIG_DRIVER_NL80211 was missing by design since the driver_nl80211.c code was not yet complete. Anyway, it is now functional enough to be included in wpa_supplicant defconfig. Though, I did leave it commented out for the time being.

Looks good to me. Thank you!

Signature · 2 lines
Regards,
Pavel Roskin