Add cleared deprecation notes on iwl,ndiswrapper,madwifi(sta) wrappers

These driver wrappers should not be used anymore; WEXT should be used
instead. However, there may still be users stuck on older kernel versions
that may require driver specific wrappers, so the source code still
remains in the repository.

diff --git a/src/drivers/driver_madwifi.c b/src/drivers/driver_madwifi.c
index e14246f43c7d24cea6533b5c5cd5d1f6599cc415..bf61fc563c8200135eb8b080103a234c31fb46c2 100644 (file)
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
@@ -12,6 +12,11 @@
  * license.
  *
  * See README and COPYING for more details.
+ *
+ * While this driver wrapper supports both AP (hostapd) and station
+ * (wpa_supplicant) operations, the station side is deprecated and
+ * driver_wext.c should be used instead. This driver wrapper should only be
+ * used with hostapd for AP mode functionality.
  */
 
 #include "includes.h"

diff --git a/src/drivers/driver_ndiswrapper.c b/src/drivers/driver_ndiswrapper.c
index 41ed4d06e2330cc2a3f4f344a4bd4fe3d3e4e036..c39ccd8ed0746d0ef354387038f958a65031d654 100644 (file)
--- a/src/drivers/driver_ndiswrapper.c
+++ b/src/drivers/driver_ndiswrapper.c
@@ -11,6 +11,10 @@
  * license.
  *
  * See README and COPYING for more details.
+ *
+ * Please note that ndiswrapper supports WPA configuration via Linux wireless
+ * extensions and if the kernel includes support for this, driver_wext.c should
+ * be used instead of this driver wrapper.
  */
 
 #include "includes.h"
@@ -345,7 +349,7 @@ static void wpa_ndiswrapper_deinit(void *priv)
 
 const struct wpa_driver_ops wpa_driver_ndiswrapper_ops = {
        .name = "ndiswrapper",
-       .desc = "Linux ndiswrapper",
+       .desc = "Linux ndiswrapper (deprecated; use wext)",
        .set_wpa = wpa_ndiswrapper_set_wpa,
        .set_key = wpa_ndiswrapper_set_key,
        .set_countermeasures = wpa_ndiswrapper_set_countermeasures,

diff --git a/wpa_supplicant/README b/wpa_supplicant/README
index 4a3cfc612c2084985278572457653dc557980642..4aa652fbad0f4b4fca84c25ead1e997cfeb10e8f 100644 (file)
--- a/wpa_supplicant/README
+++ b/wpa_supplicant/README
@@ -517,11 +517,11 @@ drivers:
   hostap = Host AP driver (Intersil Prism2/2.5/3) [default]
        (this can also be used with Linuxant DriverLoader)
   hermes = Agere Systems Inc. driver (Hermes-I/Hermes-II)
-  madwifi = MADWIFI 802.11 support (Atheros, etc.)
+  madwifi = MADWIFI 802.11 support (Atheros, etc.) (deprecated; use wext)
   atmel = ATMEL AT76C5XXx (USB, PCMCIA)
   wext = Linux wireless extensions (generic)
   ralink = Ralink Client driver
-  ndiswrapper = Linux ndiswrapper
+  ndiswrapper = Linux ndiswrapper (deprecated; use wext)
   broadcom = Broadcom wl.o driver
   ipw = Intel ipw2100/2200 driver (old; use wext with Linux 2.6.13 or newer)
   wired = wpa_supplicant wired Ethernet driver

diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index 8cb43003cdb6a6e79178590678a40ba71136d4ba..1ddffab2e7f742905524f9e1f42d8408af593fc7 100644 (file)
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -50,6 +50,7 @@ CONFIG_DRIVER_HOSTAP=y
 #CFLAGS += -I../../include/wireless
 
 # Driver interface for madwifi driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
 #CONFIG_DRIVER_MADWIFI=y
 # Set include directory to the madwifi source tree
 #CFLAGS += -I../../madwifi
@@ -60,6 +61,7 @@ CONFIG_DRIVER_HOSTAP=y
 #CONFIG_DRIVER_PRISM54=y
 
 # Driver interface for ndiswrapper
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
 #CONFIG_DRIVER_NDISWRAPPER=y
 
 # Driver interface for Atmel driver
@@ -74,6 +76,7 @@ CONFIG_DRIVER_ATMEL=y
 #CFLAGS += -I/opt/WRT54GS/release/src/include
 
 # Driver interface for Intel ipw2100/2200 driver
+# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
 #CONFIG_DRIVER_IPW=y
 
 # Driver interface for Ralink driver