Attachment #312202 for bug #477833

View | Details | Raw Unified | Return to bug 477833
Collapse All | Expand All

Lines 578-583 Link Here

(-)config/ifcfg.template (+9 lines)
578	# mulitle network sections (see wpa_supplicant documentation).	578	# mulitle network sections (see wpa_supplicant documentation).
579	WIRELESS_WPA_CONF=''	579	WIRELESS_WPA_CONF=''
580		580
		581	## Type: string
		582	## Default: ""
		583	#
		584	# This variable allows to override the wpa driver name that should be used
		585	# by the wpa_supplicant. In most cases "wext" can be used, but there are
		586	# few exceptions.
		587	#
		588	WIRELESS_WPA_DRIVER=''
		589
581	## Type: yesno	590	## Type: yesno
582	## Default: yes	591	## Default: yes
583	#	592	#





case $ACTION in
    up)
        test -n "$WIRELESS_WPA_DRIVER"    && \
        WPA_DRIVER="$WIRELESS_WPA_DRIVER" || \
        case "${DRIVER}" in
            ath_pci)
                WPA_DRIVER=wext
                ;;
            at76c5*)
                WPA_DRIVER=atmel
                PREFER_WPA_SUPPLICANT=no
                ;;
            prism54)
                WPA_DRIVER=prism54
                PREFER_WPA_SUPPLICANT=no
                ;;
            ipw2200|ipw2100|ipw3945|hostap_*)
                WPA_DRIVER=wext
                ;;
            ndiswrapper|*.sys)
                WPA_DRIVER=wext
                ;;
            rt2500usb|rt2500pci)
                WPA_DRIVER=wext
                ;;
            rt61pci|rt73usb|rt2400pci)
                WPA_DRIVER=wext
                ;;
            iwlagn|iwl3945|iwl4965)
                WPA_DRIVER=wext
                ;;
            zd1211rw)
                WPA_DRIVER=wext
                ;;
            ath5k|ath9k|ath_pci)
                WPA_DRIVER=wext
                ;;
            b43|b43legacy|ssb)
                WPA_DRIVER=wext
                ;;
            p54pci|p54usb)
                WPA_DRIVER=wext
                ;;
            at76*)
                WPA_DRIVER=wext
                ;;
            *)
                WPA_DRIVER=unsupported
                PREFER_WPA_SUPPLICANT=no

Return to bug 477833

Lines 682-711 Link Here

(-)scripts/ifup-wireless (-11 / +24 lines)
682		682
683	case $ACTION in	683	case $ACTION in
684	up)	684	up)
		685	test -n "$WIRELESS_WPA_DRIVER" && \
		686	WPA_DRIVER="$WIRELESS_WPA_DRIVER" \|\| \
685	case "${DRIVER}" in	687	case "${DRIVER}" in
686	ath_pci)
687	WPA_DRIVER=wext
688	;;
689	at76c5*)
690	WPA_DRIVER=atmel
691	PREFER_WPA_SUPPLICANT=no
692	;;
693	prism54)	688	prism54)
694	WPA_DRIVER=prism54	689	WPA_DRIVER=prism54
695	PREFER_WPA_SUPPLICANT=no	690	PREFER_WPA_SUPPLICANT=no
696	;;	691	;;
697	ipw2200\|ipw3945\|hostap_*)	692	ipw2200\|ipw2100\|ipw3945\|hostap_*)
698	WPA_DRIVER=wext	693	WPA_DRIVER=wext
699	;;	694	;;
700	ipw2100)	695	ndiswrapper\|*.sys)
701	WPA_DRIVER=wext	696	WPA_DRIVER=wext
702	;;	697	;;
703	ndiswrapper\|*.sys)	698	rt2500usb\|rt2500pci)
704	WPA_DRIVER=wext	699	WPA_DRIVER=wext
705	;;	700	;;
706	rt2500*)	701	rt61pci\|rt73usb\|rt2400pci)
707	WPA_DRIVER=wext	702	WPA_DRIVER=wext
708	;;	703	;;
		704	iwlagn\|iwl3945\|iwl4965)
		705	WPA_DRIVER=wext
		706	;;
		707	zd1211rw)
		708	WPA_DRIVER=wext
		709	;;
		710	ath5k\|ath9k\|ath_pci)
		711	WPA_DRIVER=wext
		712	;;
		713	b43\|b43legacy\|ssb)
		714	WPA_DRIVER=wext
		715	;;
		716	p54pci\|p54usb)
		717	WPA_DRIVER=wext
		718	;;
		719	at76*)
		720	WPA_DRIVER=wext
		721	;;
709	*)	722	*)
710	WPA_DRIVER=unsupported	723	WPA_DRIVER=unsupported
711	PREFER_WPA_SUPPLICANT=no	724	PREFER_WPA_SUPPLICANT=no