From 019e349e077ea98096821e2418a37f8f7ddb4192 Mon Sep 17 00:00:00 2001
From: "Chang.H.S" <jhs@dev3>
Date: Fri, 4 May 2012 14:08:01 +0900
Subject: [PATCH 1/1] WirelessLanSetup : block wireless module setup in master
 mode.

---
 .../SystemPlugins/WirelessLanSetup/plugin.py       | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
index 233662a..3207bb8 100755
--- a/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLanSetup/plugin.py
@@ -74,21 +74,38 @@ class WlanSelection(Screen,HelpableScreen):
 		iNetwork.msgPlugins()
 		iNetwork.getInterfaces()
 
+	def checkIfaceMode(self, iface = None):
+		try:
+			obj = Wireless(iface)
+			if obj.getMode() == 'Master':
+				return -1
+			else:
+				return 0
+		except:
+			return -2
+
 	def ok(self):
 #		print len(self["menulist"].list)
 		if len(self["menulist"].list) == 0:
 			self.session.open(MessageBox, (_("Can not find any WirelessLan Module\n")),MessageBox.TYPE_ERROR,5 )
 			return
-		ifaces=self["menulist"].getCurrent()[1]
-		if ifaces == None:
-			pass
+		iface=self["menulist"].getCurrent()[1]
+		if iface == None:
+			return
 		else:
-			self.session.open(WlanSetup,ifaces)
+			ret = self.checkIfaceMode(iface)
+			if ret == -2:
+				self.session.open(MessageBox, (_("Invalid WirelessLan Module.\n")),MessageBox.TYPE_ERROR,5 )
+				return
+			elif ret == -1:
+				self.session.open(MessageBox, (_("Can not setup WirelessLan Module in 'AP Mode'\n")),MessageBox.TYPE_ERROR,5 )
+				return
+		self.session.open(WlanSetup, iface)
 
 	def getWlandevice(self):
 		list = []
 		for x in iNetwork.getInstalledAdapters():
-			if x.startswith('eth'):
+			if x.startswith('eth') or x.startswith('br') or x.startswith('mon'):
 				continue
 			description=self.getAdapterDescription(x)
 			if description == "Unknown network adapter":
-- 
2.7.4