From: acid-burn <acid-burn@opendreambox.org>
Date: Tue, 15 Mar 2011 12:08:16 +0000 (+0100)
Subject: Merge remote branch 'origin/obi/bug_724_wpa_modes' into acid-burn/networking_changes
X-Git-Tag: 3.1.0~3^2~2
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/057f9b4f5534a302c6e66431894724ae213985b1?hp=-c

Merge remote branch 'origin/obi/bug_724_wpa_modes' into acid-burn/networking_changes
---

057f9b4f5534a302c6e66431894724ae213985b1
diff --combined lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
index 4a6b07c7,e629a67d..a64a5a6d
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/Wlan.py
@@@ -265,7 -265,7 +265,7 @@@ class wpaSupplicant
  				fp.write('\tssid="'+essid+'"\n')
  			fp.write('\tscan_ssid=0\n')			
  			if encrypted:
- 				if encryption == 'WPA' or encryption == 'WPA2' or encryption == 'WPA/WPA2' :
+ 				if encryption in ('WPA', 'WPA2', 'WPA/WPA2'):
  					fp.write('\tkey_mgmt=WPA-PSK\n')
  					
  					if encryption == 'WPA':
@@@ -273,15 -273,14 +273,14 @@@
  						fp.write('\tpairwise=TKIP\n')
  						fp.write('\tgroup=TKIP\n')
  					elif encryption == 'WPA2':
+ 						fp.write('\tproto=RSN\n')
+ 						fp.write('\tpairwise=CCMP\n')
+ 						fp.write('\tgroup=CCMP\n')
+ 					else:
  						fp.write('\tproto=WPA RSN\n')
  						fp.write('\tpairwise=CCMP TKIP\n')
- 						fp.write('\tgroup=CCMP TKIP\n')						
- 					else:
- 						fp.write('\tproto=WPA WPA2\n')
- 						fp.write('\tpairwise=CCMP\n')
- 						fp.write('\tgroup=TKIP\n')					
+ 						fp.write('\tgroup=CCMP TKIP\n')
  					fp.write('\tpsk="'+psk+'"\n')
- 						
  				elif encryption == 'WEP':
  					fp.write('\tkey_mgmt=NONE\n')
  					if wepkeytype == 'ASCII':
@@@ -408,7 -407,6 +407,7 @@@ class Status
  	def stopWlanConsole(self):
  		if self.WlanConsole is not None:
  			print "killing self.WlanConsole"
 +			self.WlanConsole.killAll()
  			self.WlanConsole = None
  			
  	def getDataForInterface(self, iface, callback = None):