From 19c6752b4379ade49ebd2197fabb98a8b9d13414 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 29 Feb 2008 01:23:48 +0000
Subject: simplify

---
 lib/network/connection/wireless.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index f7afb37..c402041 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -338,15 +338,13 @@ sub guess_network_access_settings {
     $self->{access}{network}{essid} = $network && $network->{essid} || $ifcfg->{WIRELESS_ESSID} || !$network && "any";
     ($self->{access}{network}{key}, my $restricted) = get_wep_key_from_iwconfig($ifcfg->{WIRELESS_ENC_KEY});
     $self->{access}{network}{encryption} =
+      $network && $network->{flags} =~ /eap/i ?
+        'wpa-eap' :
       $network && $network->{flags} =~ /wpa/i ?
         'wpa-psk' :
       $network && $network->{flags} =~ /wep/i || $self->{access}{network}{key} ?
         ($restricted ? 'restricted' : 'open') :
         'none';
-	#The above selects between wep and wpa-psk now for wpa-eap
-	if ($network->{flags} =~ /eap/i) {
-		$self->{access}{network}{encryption} = "wpa-eap";
-	}
 	#load settings if only we use wpa_suuplicant
 	wpa_supplicant_load_eap_settings($self->{access}{network}) if $self->need_wpa_supplicant;
 
-- 
cgit v1.2.1