* [PATCH] e1000: add forgotten PCI ID for supported device @ 2006-07-28 22:06 Auke Kok 2006-07-28 23:18 ` [stable] " Greg KH 0 siblings, 1 reply; 6+ messages in thread From: Auke Kok @ 2006-07-28 22:06 UTC (permalink / raw) To: Greg KH, stable Cc: John W. Linville, Ronciak, John, Auke Kok, Jesse Brandeburg, NetDev, Kok, Auke [-- Attachment #1: Type: text/plain, Size: 234 bytes --] The Intel(R) PRO/1000 82572EI card is fully supported by 7.0.33-k2 and onward. Add the device ID so this card works with 2.6.17.y onward. This device ID was accidentally omitted. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> [-- Attachment #2: e1000_stable_add_forgotten_pciid.patch --] [-- Type: text/x-patch, Size: 1042 bytes --] diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c index 523c2c9..c5e7023 100644 --- a/drivers/net/e1000/e1000_hw.c +++ b/drivers/net/e1000/e1000_hw.c @@ -353,6 +353,7 @@ e1000_set_mac_type(struct e1000_hw *hw) case E1000_DEV_ID_82572EI_COPPER: case E1000_DEV_ID_82572EI_FIBER: case E1000_DEV_ID_82572EI_SERDES: + case E1000_DEV_ID_82572EI: hw->mac_type = e1000_82572; break; case E1000_DEV_ID_82573E: diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index 150e45e..c01e5d2 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h @@ -462,6 +462,7 @@ #define E1000_DEV_ID_82571EB_SERDES #define E1000_DEV_ID_82572EI_COPPER 0x107D #define E1000_DEV_ID_82572EI_FIBER 0x107E #define E1000_DEV_ID_82572EI_SERDES 0x107F +#define E1000_DEV_ID_82572EI 0x10B9 #define E1000_DEV_ID_82573E 0x108B #define E1000_DEV_ID_82573E_IAMT 0x108C #define E1000_DEV_ID_82573L 0x109A ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH] e1000: add forgotten PCI ID for supported device 2006-07-28 22:06 [PATCH] e1000: add forgotten PCI ID for supported device Auke Kok @ 2006-07-28 23:18 ` Greg KH 2006-07-29 0:04 ` Brandeburg, Jesse 0 siblings, 1 reply; 6+ messages in thread From: Greg KH @ 2006-07-28 23:18 UTC (permalink / raw) To: Auke Kok Cc: stable, NetDev, John W. Linville, Jesse Brandeburg, Ronciak, John, Kok, Auke On Fri, Jul 28, 2006 at 03:06:17PM -0700, Auke Kok wrote: > > The Intel(R) PRO/1000 82572EI card is fully supported by 7.0.33-k2 and > onward. Add the device ID so this card works with 2.6.17.y onward. This > device ID was accidentally omitted. Sorry, but we don't add new device support in the -stable kernel tree, it's "bugfixes only." thanks, greg k-h ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH] e1000: add forgotten PCI ID for supported device 2006-07-28 23:18 ` [stable] " Greg KH @ 2006-07-29 0:04 ` Brandeburg, Jesse 2006-07-29 0:24 ` Greg KH 0 siblings, 1 reply; 6+ messages in thread From: Brandeburg, Jesse @ 2006-07-29 0:04 UTC (permalink / raw) To: Greg KH Cc: Kok, Auke-jan H, stable, NetDev, John W. Linville, Brandeburg, Jesse, Ronciak, John, Kok, Auke On Fri, 28 Jul 2006, Greg KH wrote: > On Fri, Jul 28, 2006 at 03:06:17PM -0700, Auke Kok wrote: > > > > The Intel(R) PRO/1000 82572EI card is fully supported by 7.0.33-k2 and > > onward. Add the device ID so this card works with 2.6.17.y onward. This > > device ID was accidentally omitted. > > Sorry, but we don't add new device support in the -stable kernel tree, > it's "bugfixes only." In this case I believe it to be a bug in our code, instead of adding new support. The driver code supports other device IDs for this same chip. The kernel driver advertises through our probe table and in our readme that we support this device (code is in e1000_main.c) but we don't load on it correctly due to an error when we submitted the patches (e1000_hw.c/h). Patch is very simple and low risk, but it is your call. Thanks, Jesse ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH] e1000: add forgotten PCI ID for supported device 2006-07-29 0:04 ` Brandeburg, Jesse @ 2006-07-29 0:24 ` Greg KH 2006-07-29 3:19 ` John W. Linville 0 siblings, 1 reply; 6+ messages in thread From: Greg KH @ 2006-07-29 0:24 UTC (permalink / raw) To: Brandeburg, Jesse Cc: Kok, Auke-jan H, stable, NetDev, John W. Linville, Ronciak, John, Kok, Auke On Fri, Jul 28, 2006 at 05:04:49PM -0700, Brandeburg, Jesse wrote: > On Fri, 28 Jul 2006, Greg KH wrote: > > On Fri, Jul 28, 2006 at 03:06:17PM -0700, Auke Kok wrote: > > > > > > The Intel(R) PRO/1000 82572EI card is fully supported by 7.0.33-k2 and > > > onward. Add the device ID so this card works with 2.6.17.y onward. This > > > device ID was accidentally omitted. > > > > Sorry, but we don't add new device support in the -stable kernel tree, > > it's "bugfixes only." > > In this case I believe it to be a bug in our code, instead of adding new > support. The driver code supports other device IDs for this same chip. Heh, that would be a slipery slope, as everyone who adds device ids feels that it is a "bug" that the driver does not support their device. If we were to allow this, there would be a _lot_ more -stable patches, which I don't think is a good thing to have. > The kernel driver advertises through our probe table and in our readme > that we support this device (code is in e1000_main.c) but we don't load on > it correctly due to an error when we submitted the patches (e1000_hw.c/h). > > Patch is very simple and low risk, but it is your call. Sorry, but for now, no. Users should be able to use the sysfs bind and new_id interface to add new device support for your driver, if it's written properly :) thanks, greg k-h ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH] e1000: add forgotten PCI ID for supported device 2006-07-29 0:24 ` Greg KH @ 2006-07-29 3:19 ` John W. Linville 2006-08-03 7:17 ` Greg KH 0 siblings, 1 reply; 6+ messages in thread From: John W. Linville @ 2006-07-29 3:19 UTC (permalink / raw) To: Greg KH Cc: Brandeburg, Jesse, Kok, Auke-jan H, stable, NetDev, Ronciak, John, Kok, Auke On Fri, Jul 28, 2006 at 05:24:40PM -0700, Greg KH wrote: > On Fri, Jul 28, 2006 at 05:04:49PM -0700, Brandeburg, Jesse wrote: > > The kernel driver advertises through our probe table and in our readme > > that we support this device (code is in e1000_main.c) but we don't load on > > it correctly due to an error when we submitted the patches (e1000_hw.c/h). > > > > Patch is very simple and low risk, but it is your call. > > Sorry, but for now, no. Users should be able to use the sysfs bind and > new_id interface to add new device support for your driver, if it's > written properly :) In this case it isn't an addition to the PCI ID table, but an actual added check in the code. You could make the argument that it is a bug since the PCI ID table says the device is supported, but it won't work w/o this additional check. Of course, the "if it's written properly" comment is still valid... :-) John -- John W. Linville linville@tuxdriver.com ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [stable] [PATCH] e1000: add forgotten PCI ID for supported device 2006-07-29 3:19 ` John W. Linville @ 2006-08-03 7:17 ` Greg KH 0 siblings, 0 replies; 6+ messages in thread From: Greg KH @ 2006-08-03 7:17 UTC (permalink / raw) To: John W. Linville Cc: Kok, Auke-jan H, NetDev, Brandeburg, Jesse, Ronciak, John, Kok, Auke, stable On Fri, Jul 28, 2006 at 11:19:05PM -0400, John W. Linville wrote: > On Fri, Jul 28, 2006 at 05:24:40PM -0700, Greg KH wrote: > > On Fri, Jul 28, 2006 at 05:04:49PM -0700, Brandeburg, Jesse wrote: > > > > The kernel driver advertises through our probe table and in our readme > > > that we support this device (code is in e1000_main.c) but we don't load on > > > it correctly due to an error when we submitted the patches (e1000_hw.c/h). > > > > > > Patch is very simple and low risk, but it is your call. > > > > Sorry, but for now, no. Users should be able to use the sysfs bind and > > new_id interface to add new device support for your driver, if it's > > written properly :) > > In this case it isn't an addition to the PCI ID table, but an actual > added check in the code. You could make the argument that it is a > bug since the PCI ID table says the device is supported, but it won't > work w/o this additional check. Ok, fine, you all convinced me :) Queued to -stable. thanks, greg k-h ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-08-03 7:22 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2006-07-28 22:06 [PATCH] e1000: add forgotten PCI ID for supported device Auke Kok 2006-07-28 23:18 ` [stable] " Greg KH 2006-07-29 0:04 ` Brandeburg, Jesse 2006-07-29 0:24 ` Greg KH 2006-07-29 3:19 ` John W. Linville 2006-08-03 7:17 ` Greg KH
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).