[patch] proposed patch

wpa.patch (text/plain), 1.29 KB, created by Jozef Vesely on 2005-12-06 04:12:19 UTC

--- wpa_supplicant.orig	2005-07-13 17:25:18.000000000 +0200
+++ wpa_supplicant	2005-12-06 13:05:44.000000000 +0100
@@ -64,7 +64,7 @@
 #
 # Checks to see if wireless extensions are enabled on the interface
 wpa_supplicant_check_extensions() {
-	grep -q "${1}: " /proc/net/wireless
+	grep -q "${1}: " /proc/net/wireless 2> /dev/null
 }
 
 # char* wpa_supplicant_get_essid(char *interface)
@@ -157,10 +157,14 @@
 # Returns 0 (true) when successful, non-zero otherwise
 wpa_supplicant_pre_start() {
 	local iface=$1 opts ifvar cfgfile=/etc/wpa_supplicant.conf timeout
-
-	# We only work on wirelesss interfaces
-	wpa_supplicant_check_extensions ${iface} || return 0
-
+	
+	ifvar=$( interface_variable ${iface} )
+	eval opts=\" \$\{wpa_supplicant_${ifvar}\}\"
+	
+	# We work not only on wirelesss interfaces
+	if [[ ${opts} != *' -Dwired'* ]]; then 
+		wpa_supplicant_check_extensions ${iface} || return 0
+	fi
 	# Kill off any existing wpa_supplicant on this interface
 	# This is so we can re-read the configuration file and clean any stale
 	# directories
@@ -189,8 +193,6 @@
 		return 1
 	fi
 
-	ifvar=$( interface_variable ${iface} )
-	eval opts=\" \$\{wpa_supplicant_${ifvar}\}\"
 	[[ ${opts} != *' -D'* ]] && ewarn "wpa_supplicant_${ifvar} does not define a driver"
 	
 	# Some drivers require the interface to be up