login
Header Space

 
 

[patch] e1000=y && e1000e=m regression fix (was: Re: [regression] e1000e broke e1000)

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Jeff Garzik <jeff@...>
Cc: Matthew Wilcox <matthew@...>, Kok, Auke <auke-jan.h.kok@...>, Linux Kernel Mailing List <linux-kernel@...>, NetDev <netdev@...>, e1000-list <e1000-devel@...>, linux-pci maillist <linux-pci@...>, Andrew Morton <akpm@...>, David S. Miller <davem@...>, Linus Torvalds <torvalds@...>, Jesse Brandeburg <jesse.brandeburg@...>, Ronciak, John <john.ronciak@...>, Allan, Bruce W <bruce.w.allan@...>, Greg KH <greg@...>, Arjan van de Ven <arjan@...>, Rafael J. Wysocki <rjw@...>
Date: Wednesday, April 9, 2008 - 3:38 pm

* Jeff Garzik <jeff@garzik.org> wrote:


which part of "it took a kernel developer more than an hour to figure 
out why his laptop had a dead network interface" did you not understand? 
Whatever you did, it was not apparent to me. I dont follow every tiny 
detail of the e1000 driver family, nor do 99%+ [*] of our users.

find the fix below, against current -git.

the current upstream behavior is the worst possible one and is just a 
plain bug, and the solution is dead-simple.

	Ingo

[*] guesstimate

--------------->
Subject: e1000=y && e1000e=m regression fix
From: Ingo Molnar <mingo@elte.hu>
Date: Wed Apr 09 21:09:35 CEST 2008

fix a regression from v2.6.24: do not transfer the e1000e PCI IDs from 
e1000 to e1000e if e1000 is built-in and e1000e is a module.

Built-in drivers take precedence over modules in many ways - and in this 
case it's clear that the user intended the e1000 driver to be the 
primary one. "Silently change behavior and break existing configs" is 
never a good migration strategy. Most users will use distro kernels that 
are not affected by this problem at all - nor are they affected by this 
patch - but this problem can hit users and developers who build their 
kernels themselves and migrate from v2.6.24 to v2.6.25.

this fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10427

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 drivers/net/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-x86.q/drivers/net/Kconfig
===================================================================
--- linux-x86.q.orig/drivers/net/Kconfig
+++ linux-x86.q/drivers/net/Kconfig
@@ -2022,7 +2022,7 @@ config E1000E
 	  will be called e1000e.
 
 config E1000E_ENABLED
-	def_bool E1000E != n
+	def_bool E1000E = y || ((E1000E != n) && (E1000 = E1000E))
 
 config IP1000
 	tristate "IP1000 Gigabit Ethernet support"
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
showing which hardware is unclaimed, Rick Jones, (Tue Apr 8, 4:13 pm)
Re: showing which hardware is unclaimed, Martin Mares, (Tue Apr 8, 4:35 pm)
Re: [regression] e1000e broke e1000, Dan Noe, (Tue Apr 8, 4:12 pm)
Re: [regression] e1000e broke e1000, Matthew Wilcox, (Tue Apr 8, 4:20 pm)
Re: [regression] e1000e broke e1000, Dan Noe, (Tue Apr 8, 4:39 pm)
Re: [regression] e1000e broke e1000, Ingo Molnar, (Tue Apr 8, 4:35 pm)
Re: [regression] e1000e broke e1000, Martin Mares, (Tue Apr 8, 4:36 pm)
Re: [regression] e1000e broke e1000, Bill Davidsen, (Wed Apr 9, 8:52 pm)
Re: [regression] e1000e broke e1000, Ingo Molnar, (Fri Apr 11, 4:59 am)
Re: [regression] e1000e broke e1000, Jeff Garzik, (Tue Apr 8, 3:56 pm)
Re: [regression] e1000e broke e1000, Ingo Molnar, (Tue Apr 8, 4:06 pm)
Re: [regression] e1000e broke e1000, Kok, Auke, (Tue Apr 8, 4:31 pm)
Re: [regression] e1000e broke e1000, Ingo Molnar, (Wed Apr 9, 3:12 pm)
Re: [regression] e1000e broke e1000, Jeff Garzik, (Wed Apr 9, 3:33 pm)
Re: [regression] e1000e broke e1000, Ingo Molnar, (Fri Apr 11, 7:30 am)
Re: [regression] e1000e broke e1000, Chris Friesen, (Fri Apr 11, 11:40 am)
Re: [regression] e1000e broke e1000, Willy Tarreau, (Fri Apr 11, 3:29 pm)
Re: [regression] e1000e broke e1000, Jeff Garzik, (Tue Apr 8, 4:19 pm)
Re: [regression] e1000e broke e1000, Ingo Molnar, (Tue Apr 8, 4:33 pm)
Re: [regression] e1000e broke e1000, Jeff Garzik, (Tue Apr 8, 4:56 pm)
[patch] e1000=y && e1000e=m regression fix (was: Re:..., Ingo Molnar, (Wed Apr 9, 3:38 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Chris Friesen, (Thu Apr 10, 5:20 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Ingo Molnar, (Thu Apr 10, 3:27 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Ingo Molnar, (Fri Apr 11, 7:26 am)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Christoph Hellwig, (Fri Apr 11, 7:36 am)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Ingo Molnar, (Fri Apr 11, 8:16 am)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Martin Mares, (Fri Apr 11, 1:10 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Christoph Hellwig, (Fri Apr 11, 12:45 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Linus Torvalds, (Fri Apr 11, 1:34 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Daniel Barkalow, (Fri Apr 11, 6:06 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Linus Torvalds, (Fri Apr 11, 7:00 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Jeff Garzik, (Fri Apr 11, 7:43 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Linus Torvalds, (Sun Apr 13, 5:13 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Ondrej Zary, (Sun Apr 13, 5:34 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Christoph Hellwig, (Sat Apr 12, 9:07 am)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Daniel Barkalow, (Fri Apr 11, 7:15 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Jeff Garzik, (Fri Apr 11, 6:21 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Daniel Barkalow, (Fri Apr 11, 7:05 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Matthew Wilcox, (Fri Apr 11, 1:53 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Linus Torvalds, (Fri Apr 11, 2:51 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Krzysztof Halasa, (Fri Apr 11, 4:22 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Linus Torvalds, (Fri Apr 11, 4:29 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Matthew Wilcox, (Fri Apr 11, 3:01 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Linus Torvalds, (Fri Apr 11, 4:21 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Willy Tarreau, (Fri Apr 11, 3:25 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Matthew Wilcox, (Fri Apr 11, 3:38 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Philip Craig, (Thu Apr 10, 8:46 pm)
Re: [patch] e1000=y &amp;&amp; e1000e=m regression fix, Randy Dunlap, (Thu Apr 10, 5:44 pm)
Re: [E1000-devel] [regression] e1000e broke e1000, Kok, Auke, (Tue Apr 8, 4:47 pm)
speck-geostationary