From: acid-burn <acid-burn@opendreambox.org>
Date: Wed, 31 Mar 2010 08:42:40 +0000 (+0200)
Subject: Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=97d46aee1158e549c110d66a0e1c4185c3cbbdf3;hp=-c

Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'
---

97d46aee1158e549c110d66a0e1c4185c3cbbdf3
diff --combined lib/python/Components/Network.py
index 45b8bfa,29491cb..b9da48d
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@@ -14,7 -14,7 +14,7 @@@ class Network
  		self.NetworkState = 0
  		self.DnsState = 0
  		self.nameservers = []
 -		self.ethtool_bin = "/usr/sbin/ethtool"
 +		self.ethtool_bin = "ethtool"
  		self.container = eConsoleAppContainer()
  		self.Console = Console()
  		self.LinkConsole = Console()
@@@ -580,11 -580,11 +580,11 @@@
  				self.wlanmodule = 'madwifi'
  		if os_path.exists(rt73_dir):
  			rtfiles = listdir(rt73_dir)
- 			if len(rtfiles) == 2:
+ 			if len(rtfiles) == 2 or len(rtfiles) == 5:
  				self.wlanmodule = 'ralink'
  		if os_path.exists(zd1211b_dir):
  			zdfiles = listdir(zd1211b_dir)
- 			if len(zdfiles) == 1:
+ 			if len(zdfiles) == 1 or len(zdfiles) == 5:
  				self.wlanmodule = 'zydas'
  		return self.wlanmodule