diff -u module-init-tools-3.12/debian/changelog module-init-tools-3.12/debian/changelog --- module-init-tools-3.12/debian/changelog +++ module-init-tools-3.12/debian/changelog @@ -1,3 +1,11 @@ +module-init-tools (3.12-1ubuntu6) natty; urgency=low + + * Remove intel-3945-iwlagn-disable11n.conf as the iwl3945 driver doesn't + support the 11n_disable option. This fixes the problem of the iwl3945 + module failing to start up. (LP: #747025) + + -- Bilal Akhtar Fri, 01 Apr 2011 10:15:51 +0300 + module-init-tools (3.12-1ubuntu5) natty; urgency=low * Added intel-3945-iwlagn-disable11n.conf diff -u module-init-tools-3.12/debian/module-init-tools.postrm module-init-tools-3.12/debian/module-init-tools.postrm --- module-init-tools-3.12/debian/module-init-tools.postrm +++ module-init-tools-3.12/debian/module-init-tools.postrm @@ -185,4 +185,7 @@ dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-5300-iwlagn-disable11n.conf 3.12-1ubuntu4 -- "$@" +# iwl3945 no longer supports 11n_disable option, hence remove the config file from the system (LP: #747025) +dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-3945-iwlagn-disable11n.conf 3.12-1ubuntu5 -- "$@" + #DEBHELPER# exit 0 diff -u module-init-tools-3.12/debian/module-init-tools.preinst module-init-tools-3.12/debian/module-init-tools.preinst --- module-init-tools-3.12/debian/module-init-tools.preinst +++ module-init-tools-3.12/debian/module-init-tools.preinst @@ -109,4 +109,7 @@ dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-5300-iwlagn-disable11n.conf 3.12-1ubuntu4 -- "$@" +# iwl3945 no longer supports 11n_disable option, hence remove the config file from the system (LP: #747025) +dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-3945-iwlagn-disable11n.conf 3.12-1ubuntu5 -- "$@" + #DEBHELPER# exit 0 diff -u module-init-tools-3.12/debian/module-init-tools.postinst module-init-tools-3.12/debian/module-init-tools.postinst --- module-init-tools-3.12/debian/module-init-tools.postinst +++ module-init-tools-3.12/debian/module-init-tools.postinst @@ -141,4 +141,7 @@ dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-5300-iwlagn-disable11n.conf 3.12-1ubuntu4 -- "$@" +# iwl3945 no longer supports 11n_disable option, hence remove the config file from the system (LP: #747025) +dpkg-maintscript-helper rm_conffile /etc/modprobe.d/intel-3945-iwlagn-disable11n.conf 3.12-1ubuntu5 -- "$@" + #DEBHELPER# exit 0 reverted: --- module-init-tools-3.12/debian/modprobe.d/intel-3945-iwlagn-disable11n.conf +++ module-init-tools-3.12.orig/debian/modprobe.d/intel-3945-iwlagn-disable11n.conf @@ -1 +0,0 @@ -options iwl3945 11n_disable=1