diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-05-25 08:40:07 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-05-25 10:24:53 +0200 |
| commit | 861c2d6a46199c0fd1cf253451b6bcf8f1de2f6e (patch) | |
| tree | 88e59441f4cbaf8fb75c5cda523715a40b9e3d70 | |
| parent | 2a95ee7b5dbeb68bda0cfd868f9aef54fa9e3fd1 (diff) | |
| download | ptxdist-861c2d6a46199c0fd1cf253451b6bcf8f1de2f6e.tar.gz ptxdist-861c2d6a46199c0fd1cf253451b6bcf8f1de2f6e.tar.xz | |
wpa_supplicant: version bump 0.7.3 -> 1.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/wpa_supplicant.in | 32 | ||||
| -rw-r--r-- | rules/wpa_supplicant.make | 8 |
2 files changed, 11 insertions, 29 deletions
diff --git a/rules/wpa_supplicant.in b/rules/wpa_supplicant.in index ada95df62..3f634ab12 100644 --- a/rules/wpa_supplicant.in +++ b/rules/wpa_supplicant.in @@ -44,13 +44,6 @@ config WPA_SUPPLICANT_DRIVER_HOSTAP help TBD -config WPA_SUPPLICANT_DRIVER_HERMES - bool - prompt "hermes" - depends on BROKEN - help - TBD - config WPA_SUPPLICANT_DRIVER_MADWIFI bool prompt "madwifi" @@ -58,17 +51,16 @@ config WPA_SUPPLICANT_DRIVER_MADWIFI help TBD -config WPA_SUPPLICANT_DRIVER_ATMEL - bool - prompt "atmel" - help - TBD - config WPA_SUPPLICANT_DRIVER_WEXT bool prompt "wext" help - TBD + Driver interface for generic Linux wireless extensions + Note: WEXT is deprecated in the current Linux kernel version and no new + functionality is added to it. nl80211-based interface is the new + replacement for WEXT and its use allows wpa_supplicant to properly control + the driver to improve existing functionality like roaming and to support new + functionality. config WPA_SUPPLICANT_DRIVER_RALINK bool @@ -76,12 +68,6 @@ config WPA_SUPPLICANT_DRIVER_RALINK help TBD -config WPA_SUPPLICANT_DRIVER_NDISWRAPPER - bool - prompt "ndiswrapper" - help - TBD - config WPA_SUPPLICANT_DRIVER_BROADCOM bool prompt "broadcom" @@ -89,12 +75,6 @@ config WPA_SUPPLICANT_DRIVER_BROADCOM help TBD -config WPA_SUPPLICANT_DRIVER_IPW - bool - prompt "ipw" - help - TBD - config WPA_SUPPLICANT_DRIVER_BSD bool prompt "bsd" diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make index 03a043ad9..436caaa19 100644 --- a/rules/wpa_supplicant.make +++ b/rules/wpa_supplicant.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_WPA_SUPPLICANT) += wpa_supplicant # Paths and names # WPA_SUPPLICANT_NAME := wpa_supplicant -WPA_SUPPLICANT_VERSION := 0.7.3 -WPA_SUPPLICANT_MD5 := f516f191384a9a546e3f5145c08addda +WPA_SUPPLICANT_VERSION := 1.0 +WPA_SUPPLICANT_MD5 := 8650f6aa23646ef634402552d0669640 WPA_SUPPLICANT := $(WPA_SUPPLICANT_NAME)-$(WPA_SUPPLICANT_VERSION) WPA_SUPPLICANT_SUFFIX := tar.gz WPA_SUPPLICANT_URL := http://hostap.epitest.fi/releases/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX) @@ -68,6 +68,7 @@ $(STATEDIR)/wpa_supplicant.prepare: echo "CONFIG_WPS2=y" >> $(WPA_SUPPLICANT_CONFIG) && \ echo "CONFIG_IEEE80211N=y" >> $(WPA_SUPPLICANT_CONFIG) && \ echo "CONFIG_CTRL_IFACE=y" >> $(WPA_SUPPLICANT_CONFIG) && \ + echo "CONFIG_WPA_CLI_EDIT=y" >> $(WPA_SUPPLICANT_CONFIG) && \ echo "CONFIG_EAP_GTC=y" >> $(WPA_SUPPLICANT_CONFIG) && \ echo "CONFIG_EAP_LEAP=y" >> $(WPA_SUPPLICANT_CONFIG) && \ echo "CONFIG_EAP_MD5=y" >> $(WPA_SUPPLICANT_CONFIG) && \ @@ -79,7 +80,8 @@ $(STATEDIR)/wpa_supplicant.prepare: echo "CONFIG_IEEE8021X_EAPOL=y" >> $(WPA_SUPPLICANT_CONFIG) && \ echo "CONFIG_PEERKEY=y" >> $(WPA_SUPPLICANT_CONFIG) && \ echo "CONFIG_PKCS12=y" >> $(WPA_SUPPLICANT_CONFIG) && \ - echo "CONFIG_SMARTCARD=y" >> $(WPA_SUPPLICANT_CONFIG) + echo "CONFIG_SMARTCARD=y" >> $(WPA_SUPPLICANT_CONFIG) && \ + echo "CONFIG_IEEE80211N=y" >> $(WPA_SUPPLICANT_CONFIG) @grep -e PTXCONF_WPA_SUPPLICANT_ $(PTXDIST_PTXCONFIG) | \ sed -e 's/PTXCONF_WPA_SUPPLICANT_/CONFIG_/g' >> $(WPA_SUPPLICANT_CONFIG) |