[pkg-wpa-devel] r1170 - in /wpasupplicant/trunk/debian: README.modes changelog config/kfreebsd config/linux ifupdown/functions.sh madwifi-headers/

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Wed May 28 12:23:53 UTC 2008 

Author: kelmo-guest
Date: Wed May 28 12:23:52 2008
New Revision: 1170

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1170
Log:
* Disable building of test driver backend, no development can sanely be done
  with this binary package.
* Disable building of hostap driver backend, the version of hostap driver in
  existence since Linux 2.6.14 (or before) uses the wext driver backend.
* Provide code in ./debian/ifupdown/functions.sh that warns about invalid
  wpa-driver choice, and falls back to the usage of a default backend.
* Modify debian/README.modes to not contain blurb about which driver_backend
  to use, wext should almost _always_ be used.

Removed:
    wpasupplicant/trunk/debian/madwifi-headers/
Modified:
    wpasupplicant/trunk/debian/README.modes
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/config/kfreebsd
    wpasupplicant/trunk/debian/config/linux
    wpasupplicant/trunk/debian/ifupdown/functions.sh

Modified: wpasupplicant/trunk/debian/README.modes
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/README.modes?rev=1170&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/README.modes (original)
+++ wpasupplicant/trunk/debian/README.modes Wed May 28 12:23:52 2008
@@ -9,7 +9,7 @@
 
 1. Specifying the wpa_supplicant driver backend
         - Table of supported drivers
-        - Common Driver Recommendations
+        - Choosing driver backend
 
 2. Mode #1: Managed Mode
         - Examples
@@ -49,36 +49,26 @@
 
 Driver         Description
 ======         ===========
-hostap         Host AP driver (Intersil Prism2/2.5/3)
 madwifi        MADWIFI 802.11 support (Atheros, etc.)
 atmel          ATMEL AT76C5XXx (USB, PCMCIA)
 wext           Linux wireless extensions (generic)
 wired          wired Ethernet driver
 test           test driver
 
-Common Driver Recommendations
-=============================
-
-The Intel Pro Wireless adapters (ipw2100, ipw2200 and ipw3945) all use the
-'wext' backend, the 'ipw' backend is deprecated and no longer provided.
-
-Madwifi supports both the 'wext' and 'madwifi' driver backends. 'wext' is
-the preferred driver interface.
-
-Ndiswrapper NO LONGER SUPPORTS the 'ndiswrapper' driver backend as of version
-1.16. Therefore, 'wext' must be used.
+Choosing driver backend
+=======================
 
 Set the driver type in the interfaces(5) stanza for your device with the
 'wpa-driver' option. For example:
 
 iface eth0 inet dhcp
-        wpa-driver madwifi
+        wpa-driver wext
         . . . . . more options
 
 If no wpa-driver configuration is supplied, the wext backend is used.
 
 2. Mode #1: Managed Mode
-=======================
+========================
 
 This mode provides the ability to establish a connection via wpa_supplicant to
 one known network. It is similar to how the wireless-tools package works. Each
@@ -121,7 +111,7 @@
 # A static network address assignment is used.
 #
 iface ath0 inet static
-        wpa-driver madwifi
+        wpa-driver wext
         wpa-ssid HotSpot1
         wpa-bssid 00:1a:2b:3c:4d:5e
         # plaintext passphrase

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1170&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed May 28 12:23:52 2008
@@ -23,8 +23,16 @@
   * Slightly modify the way get-git-snapshot is invoked by debian/rules.
   * Create debian/config/ directory to contain various build configuration
     files for different targets (eg. udeb, kfreebsd, linux).
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 25 May 2008 22:32:41 +1000
+  * Disable building of test driver backend, no development can sanely be done
+    with this binary package.
+  * Disable building of hostap driver backend, the version of hostap driver in
+    existence since Linux 2.6.14 (or before) uses the wext driver backend.
+  * Provide code in ./debian/ifupdown/functions.sh that warns about invalid
+    wpa-driver choice, and falls back to the usage of a default backend.
+  * Modify debian/README.modes to not contain blurb about which driver_backend
+    to use, wext should almost _always_ be used.
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 28 May 2008 22:21:46 +1000
 
 wpasupplicant (0.6.3-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/config/kfreebsd
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/kfreebsd?rev=1170&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/kfreebsd (original)
+++ wpasupplicant/trunk/debian/config/kfreebsd Wed May 28 12:23:52 2008
@@ -45,7 +45,6 @@
 #CONFIG_DRIVER_WEXT=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-# XXX: we are not FreeBSD
 CONFIG_DRIVER_BSD=y
 #CFLAGS += -I/usr/local/include
 LIBS += -lbsd
@@ -68,7 +67,7 @@
 # CONFIG_USE_NDISUIO=y
 
 # Driver interface for development testing
-CONFIG_DRIVER_TEST=y
+#CONFIG_DRIVER_TEST=y
 
 # Driver interface for wired Ethernet drivers
 #CONFIG_DRIVER_WIRED=y

Modified: wpasupplicant/trunk/debian/config/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/linux?rev=1170&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/linux (original)
+++ wpasupplicant/trunk/debian/config/linux Wed May 28 12:23:52 2008
@@ -1,7 +1,8 @@
 # Debian's wpa_supplicant build time configuration
 
 # Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
+# XXX: Linux mainline hostap driver supports wext since Linux 2.6.14 (or earlier)
+#CONFIG_DRIVER_HOSTAP=y
 
 # Driver interface for Agere driver
 # XXX: Non-GPL header required
@@ -11,9 +12,10 @@
 #CFLAGS += -I../../include/wireless
 
 # Driver interface for madwifi driver
-CONFIG_DRIVER_MADWIFI=y
+# XXX: madwifi driver supports wext in all Debian releases so far
+#CONFIG_DRIVER_MADWIFI=y
 # Change include directories to match with the local setup
-CFLAGS += -I../debian/madwifi-headers
+#CFLAGS += -I../debian/madwifi-headers
 
 # Driver interface for Prism54 driver
 # (Note: Prism54 is not yet supported, i.e., this will not work as-is and is
@@ -68,7 +70,7 @@
 # CONFIG_USE_NDISUIO=y
 
 # Driver interface for development testing
-CONFIG_DRIVER_TEST=y
+#CONFIG_DRIVER_TEST=y
 
 # Driver interface for wired Ethernet drivers
 CONFIG_DRIVER_WIRED=y

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1170&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Wed May 28 12:23:52 2008
@@ -209,8 +209,17 @@
 	fi
 
 	if [ -n "$IF_WPA_DRIVER" ]; then
-		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D $IF_WPA_DRIVER"
 		wpa_msg verbose "wpa-driver $IF_WPA_DRIVER"
+		case "$IF_WPA_DRIVER" in
+			hostap|ipw|ndiswrapper)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D wext"
+				wpa_msg stderr "\"$IF_WPA_DRIVER\" wpa-driver is unsupported"
+				wpa_msg stderr "using \"wext\" wpa-driver instead ..."
+				;;
+			*)
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D $IF_WPA_DRIVER"
+				;;
+		esac
 	else
 		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D wext"
 		wpa_msg verbose "using default driver type: wpa-driver wext"

More information about the Pkg-wpa-devel mailing list