[kernel] r8087 - in dists/sid/linux-2.6/debian: . patches/features patches/series

[Jurij Smakov]

Author: jurij-guest
Date: Thu Jan  4 06:38:36 2007
New Revision: 8087

Added:
   dists/sid/linux-2.6/debian/patches/features/tulip-dmfe-disable.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
Add features/tulip-dmfe-disable.patch, introducing the 'disable' 
parameter for the tulip and dmfe modules. Both modules claim to 
support some devices with identical PCI IDs, so they are both loaded 
by udev, breaking networking in the installer. This patch provides a 
simple way to disable the unwanted driver at installer's boot time. 
(closes: #334104)


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Jan  4 06:38:36 2007
@@ -131,6 +131,11 @@
   * Add bugfix/sparc/ehci-hub-contol-alignment.patch to prevent unaligned
     memory accesses in ehci-hub-control() by adding an alignment attribute
     to the tbuf array declaration. Thanks to David Miller for the patch.
+  * Add features/tulip-dmfe-disable.patch, introducing the 'disable' parameter
+    for the tulip and dmfe modules. Both modules claim to support some devices
+    with identical PCI IDs, so they are both loaded by udev, breaking
+    networking in the installer. This patch provides a simple way to disable
+    the unwanted driver at installer's boot time. (closes: #334104)
 
  -- Christian T. Steigies <cts at debian.org>  Wed,  3 Jan 2007 21:24:25 +0100
 

Added: dists/sid/linux-2.6/debian/patches/features/tulip-dmfe-disable.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/features/tulip-dmfe-disable.patch	Thu Jan  4 06:38:36 2007
@@ -0,0 +1,81 @@
+diff -aur a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
+--- a/drivers/net/tulip/dmfe.c	2006-09-19 20:42:06.000000000 -0700
++++ b/drivers/net/tulip/dmfe.c	2006-11-29 21:00:45.000000000 -0800
+@@ -281,6 +281,7 @@
+ 
+ /* For module input parameter */
+ static int debug;
++static int disable;
+ static u32 cr6set;
+ static unsigned char mode = 8;
+ static u8 chkmode = 1;
+@@ -1987,6 +1988,7 @@
+ MODULE_VERSION(DRV_VERSION);
+ 
+ module_param(debug, int, 0);
++module_param(disable, int, 0);
+ module_param(mode, byte, 0);
+ module_param(cr6set, int, 0);
+ module_param(chkmode, byte, 0);
+@@ -2008,6 +2010,11 @@
+ {
+ 	int rc;
+ 
++	if (disable) {
++		printk(KERN_INFO "dmfe: driver disabled, aborting initialization.\n");
++		return 0;
++	}
++
+ 	printk(version);
+ 	printed_version = 1;
+ 
+@@ -2055,6 +2062,8 @@
+ 
+ static void __exit dmfe_cleanup_module(void)
+ {
++	if (disable)
++		return;
+ 	DMFE_DBUG(0, "dmfe_clean_module() ", debug);
+ 	pci_unregister_driver(&dmfe_driver);
+ }
+diff -aur a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
+--- a/drivers/net/tulip/tulip_core.c	2006-09-19 20:42:06.000000000 -0700
++++ b/drivers/net/tulip/tulip_core.c	2006-11-29 21:01:04.000000000 -0800
+@@ -106,6 +106,8 @@
+ static int csr0 = 0x00A00000 | 0x4800;
+ #endif
+ 
++static int disable;
++
+ /* Operational parameters that usually are not changed. */
+ /* Time in jiffies before concluding the transmitter is hung. */
+ #define TX_TIMEOUT  (4*HZ)
+@@ -116,6 +118,7 @@
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION(DRV_VERSION);
+ module_param(tulip_debug, int, 0);
++module_param(disable, int, 0);
+ module_param(max_interrupt_work, int, 0);
+ module_param(rx_copybreak, int, 0);
+ module_param(csr0, int, 0);
+@@ -1840,6 +1843,11 @@
+ 
+ static int __init tulip_init (void)
+ {
++	if (disable) {
++		printk (KERN_INFO "tulip: driver disabled, aborting initialization\n");
++		return 0;
++	}
++
+ #ifdef MODULE
+ 	printk (KERN_INFO "%s", version);
+ #endif
+@@ -1855,6 +1863,8 @@
+ 
+ static void __exit tulip_cleanup (void)
+ {
++	if (disable)
++		return;
+ 	pci_unregister_driver (&tulip_driver);
+ }
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	(original)
+++ dists/sid/linux-2.6/debian/patches/series/9	Thu Jan  4 06:38:36 2007
@@ -41,3 +41,4 @@
 + bugfix/net-r8169-rm-extraneous-write.patch
 + bugfix/mips/provide-pci_get_legacy_ide_irq.patch
 + features/sound-detect-ALC883.patch
++ features/tulip-dmfe-disable.patch