From: Roy Marples <roy@marples.name>
Date: Sat, 13 Sep 2014 23:42:18 +0000 (+0000)
Subject: Add wpa_supplicant_driver option for nl80211 users.
X-Git-Tag: v6.4.4~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbd250b405acd892a9346f8c4a2599c2105c1f17;p=thirdparty%2Fdhcpcd.git

Add wpa_supplicant_driver option for nl80211 users.
---

diff --git a/dhcpcd-hooks/10-wpa_supplicant b/dhcpcd-hooks/10-wpa_supplicant
index 716bd315..9eec0c1f 100644
--- a/dhcpcd-hooks/10-wpa_supplicant
+++ b/dhcpcd-hooks/10-wpa_supplicant
@@ -59,7 +59,9 @@ wpa_supplicant_start()
 
 	wpa_cli -p "$dir" -i "$interface" status >/dev/null 2>&1 && return 0
 	syslog info "starting wpa_supplicant"
-	err=$(wpa_supplicant -B -c"$wpa_supplicant_conf" -i"$interface" 2>&1)
+	driver=${wpa_supplicant_driver:+-D}$wpa_supplicant_driver
+	err=$(wpa_supplicant -B -c"$wpa_supplicant_conf" -i"$interface" \
+	    "$driver" 2>&1)
 	errn=$?
 	if [ $errn != 0 ]; then
 		syslog err "failed to start wpa_supplicant"
diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index cc10a16a..df63b4e8 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd August 7, 2014
+.Dd September 14, 2014
 .Dt DHCPCD.CONF 5
 .Os
 .Sh NAME
@@ -139,6 +139,11 @@ to the environment for use in
 For example, you can force the hostname hook to always set the hostname with
 .Ic env
 .Va force_hostname=YES .
+Or set which driver
+.Xr wpa_supplicant 8
+should use with
+.Ic env
+.Va wpa_supplicant_driver=nl80211
 .Pp
 If the hostname is set, will be will set to the FQDN if possible as per
 RFC 4702 section 3.1.