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

(-)ifup-wireless.bak (-4 / +19 lines)
Lines 352-361 Link Here
352
			err_mesg "Could not query device: $result"
352
			err_mesg "Could not query device: $result"
353
			exit $R_ERROR
353
			exit $R_ERROR
354
		fi
354
		fi
355
		if [ "$dot11PrivacyOptionImplemented" = "false" ]; then
355
                if [ "$dot11PrivacyOptionImplemented" = "false" ]; then
356
			err_mesg "Could not set encryption, device does not support it"
356
                        logerror "Could not set encryption, device does not support it - fallback to iwconfig"
357
			exit $R_ERROR
357
                        iwconfig $INTERFACE key $WIRELESS_KEY_0
358
		fi
358
                         #exit $R_ERROR
359
                else
360
                        wlanctl dot11req_mibset mibattribute=dot11PrivacyInvoked=true
361
                        test -z "$WIRELESS_DEFAULT_KEY" && WIRELESS_DEFAULT_KEY=0
362
                        wlanctl dot11req_mibset mibattribute=dot11WEPDefaultKeyID=$WIRELESS_DEFAULT_KEY
363
                        for i in 0 1 2 3 ; do
364
                                eval K=\$WIRELESS_KEY_$i
365
                                if [ -n "$K" ]; then
366
                                        wlanctl dot11req_mibset mibattribute=dot11WEPDefaultKey$i=$( format_key $K )
367
                                        test $RETVAL -ne 0 &&
368
                                        { logerror "Setting encryption key failed, aborting interface setup" ;
369
                                          exit $R_ERROR ; }
370
                                fi
371
                        done
372
                fi
373
359
		wlanctl dot11req_mibset mibattribute=dot11PrivacyInvoked=true
374
		wlanctl dot11req_mibset mibattribute=dot11PrivacyInvoked=true
360
		test -z "$WIRELESS_DEFAULT_KEY" && WIRELESS_DEFAULT_KEY=0
375
		test -z "$WIRELESS_DEFAULT_KEY" && WIRELESS_DEFAULT_KEY=0
361
		wlanctl dot11req_mibset mibattribute=dot11WEPDefaultKeyID=$WIRELESS_DEFAULT_KEY
376
		wlanctl dot11req_mibset mibattribute=dot11WEPDefaultKeyID=$WIRELESS_DEFAULT_KEY

Return to bug 157503