From: Michael Prokop <mika@grml.org>
Date: Mon, 8 Nov 2010 17:52:48 +0000 (+0100)
Subject: Drop deprecated config_ipw3945() function to check for broken ipw3945 module.
X-Git-Tag: v0.9.17~1
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=8ae37ab733a40aa3d76400cee6f836305ca7ccec

Drop deprecated config_ipw3945() function to check for broken ipw3945 module.
---

diff --git a/autoconfig b/autoconfig
index 229a7c5..4fe6b3b 100644
--- a/autoconfig
+++ b/autoconfig
@@ -88,7 +88,6 @@ CONFIG_HOTPLUG_BLACKLIST='no' # check for blacklist bootparam
 CONFIG_HOTPLUG_MAIN='no'      # start hotplug system [should be handled by udev now]
 CONFIG_HWINFO='no'            # run hwinfo for module-detection (requires bootparam 'hwinfo'!)
 CONFIG_HWSPEAK='yes'          # support for hardware synthesizer via speakup
-CONFIG_IPW3945='yes'          # check for broken ipw3945 module
 CONFIG_KERNEL='yes'           # display information on running kernel
 CONFIG_LANGUAGE='yes'         # allow language specification via commandline
 CONFIG_LD_MOD='yes'           # run ldconfig and depmod on systems running from harddisk; remove /etc/grml.first.boot for forcing
diff --git a/autoconfig.functions b/autoconfig.functions
index cab5044..9d85bc8 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -2496,19 +2496,6 @@ fi
 }
 # }}}
 
-# {{{ check for broken ipw3945 driver which causes problems (especially on hd install)
-config_ipw3945() {
-  if grep -q ipw3945 /proc/modules ; then
-     if ! iwconfig 2>/dev/null| grep -qe 'IEEE 802' -qe 'unassociated' ; then
-        ewarn "Broken ipw3945 network interface found, reloading module."
-        rmmod ipw3945
-        modprobe ipw3945
-        eend $?
-     fi
-  fi
-}
-# }}}
-
 # {{{ disable console blanking
 config_blanking(){
 if checkbootparam 'noblank' ; then
diff --git a/grml-autoconfig b/grml-autoconfig
index c50062a..f2a5524 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -258,8 +258,6 @@ checkvalue $CONFIG_CREATE_MNT_DIRS && create_mnt_dirs
 
 checkvalue $CONFIG_915RESOLUTION && config_915resolution
 
-checkvalue $CONFIG_IPW3945 && config_ipw3945
-
 checkvalue $CONFIG_MYPATH && config_mypath
 
 checkvalue $CONFIG_DISTCC && config_distcc