[PATCH]: e1000: Janitor: Use #defined values for literals
Resending a minor janitorial patch from long ago that seems to have fallen through the cracks. Its not in 2.6.18-git4 nor in 2.6.18-mm1. Please apply and forward upstream. --linas [PATCH]: e1000: Janitor: Use #defined values for literals Minor janitorial patch: use #defines for literal values. Signed-off-by: Linas Vepstas [EMAIL PROTECTED] drivers/net/e1000/e1000_main.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.18-mm1/drivers/net/e1000/e1000_main.c === --- linux-2.6.18-mm1.orig/drivers/net/e1000/e1000_main.c2006-09-25 17:23:32.0 -0500 +++ linux-2.6.18-mm1/drivers/net/e1000/e1000_main.c 2006-09-25 17:23:51.0 -0500 @@ -4986,8 +4986,8 @@ static pci_ers_result_t e1000_io_slot_re } pci_set_master(pdev); - pci_enable_wake(pdev, 3, 0); - pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */ + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); /* Perform card reset only on one instance of the card */ if (PCI_FUNC (pdev-devfn) != 0) - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH]: e1000: Janitor: Use #defined values for literals
Linas Vepstas wrote: Resending a minor janitorial patch from long ago that seems to have fallen through the cracks. Its not in 2.6.18-git4 nor in 2.6.18-mm1. Please apply and forward upstream. --linas [PATCH]: e1000: Janitor: Use #defined values for literals Minor janitorial patch: use #defines for literal values. Signed-off-by: Linas Vepstas [EMAIL PROTECTED] I'll stack this on this weeks resend of last weeks e1000/e100/ixgb changes. Thanks. Auke drivers/net/e1000/e1000_main.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.18-mm1/drivers/net/e1000/e1000_main.c === --- linux-2.6.18-mm1.orig/drivers/net/e1000/e1000_main.c2006-09-25 17:23:32.0 -0500 +++ linux-2.6.18-mm1/drivers/net/e1000/e1000_main.c 2006-09-25 17:23:51.0 -0500 @@ -4986,8 +4986,8 @@ static pci_ers_result_t e1000_io_slot_re } pci_set_master(pdev); - pci_enable_wake(pdev, 3, 0); - pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */ + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); /* Perform card reset only on one instance of the card */ if (PCI_FUNC (pdev-devfn) != 0) - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH]: e1000: Janitor: Use #defined values for literals
Resending patch from 23 June 2006; there was some confusion about whether a similar patch had already been applied; seems it wasn't. Minor janitorial patch: use #defines for literal values. Signed-off-by: Linas Vepstas [EMAIL PROTECTED] drivers/net/e1000/e1000_main.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c === --- linux-2.6.18-rc3-mm2.orig/drivers/net/e1000/e1000_main.c2006-08-07 14:39:37.0 -0500 +++ linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c 2006-08-07 15:06:31.0 -0500 @@ -4955,8 +4955,8 @@ static pci_ers_result_t e1000_io_slot_re } pci_set_master(pdev); - pci_enable_wake(pdev, 3, 0); - pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */ + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); /* Perform card reset only on one instance of the card */ if (PCI_FUNC (pdev-devfn) != 0) - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH]: e1000: Janitor: Use #defined values for literals
Linas Vepstas wrote: Resending patch from 23 June 2006; there was some confusion about whether a similar patch had already been applied; seems it wasn't. Minor janitorial patch: use #defines for literal values. Signed-off-by: Linas Vepstas [EMAIL PROTECTED] Acked-by: Auke Kok [EMAIL PROTECTED] drivers/net/e1000/e1000_main.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c === --- linux-2.6.18-rc3-mm2.orig/drivers/net/e1000/e1000_main.c2006-08-07 14:39:37.0 -0500 +++ linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c 2006-08-07 15:06:31.0 -0500 @@ -4955,8 +4955,8 @@ static pci_ers_result_t e1000_io_slot_re } pci_set_master(pdev); - pci_enable_wake(pdev, 3, 0); - pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */ + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); /* Perform card reset only on one instance of the card */ if (PCI_FUNC (pdev-devfn) != 0) - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH]: e1000: Janitor: Use #defined values for literals
hopefully queued-by, as well... - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH]: e1000: Janitor: Use #defined values for literals
On Fri, Jun 23, 2006 at 01:07:21PM -0700, Auke Kok wrote: Linas Vepstas wrote: Minor janitorial patch: use #defines for literal values. +pci_enable_wake(pdev, PCI_D3hot, 0); +pci_enable_wake(pdev, PCI_D3cold, 0); I Acked this but that's silly - the patches sent yesterday already change the code above and this patch is no longer needed (thanks Jesse for spotting this). This patch would conflict with them so please don't apply. Maybe there's a backlog in the queue, but I not this is not yet in 2.6.17-mm3 --linas - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH]: e1000: Janitor: Use #defined values for literals
Linas Vepstas wrote: On Fri, Jun 23, 2006 at 01:07:21PM -0700, Auke Kok wrote: Linas Vepstas wrote: Minor janitorial patch: use #defines for literal values. + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); I Acked this but that's silly - the patches sent yesterday already change the code above and this patch is no longer needed (thanks Jesse for spotting this). This patch would conflict with them so please don't apply. Maybe there's a backlog in the queue, but I not this is not yet in 2.6.17-mm3 It's part of the submission for 2.6.18 I sent to jgarzik on friday, which cleans up this section in the way. Auke - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH]: e1000: Janitor: Use #defined values for literals
Linas Vepstas wrote: Minor janitorial patch: use #defines for literal values. Signed-off-by: Linas Vepstas [EMAIL PROTECTED] Ack! I thought we had gotten these out already. Cheers, Auke drivers/net/e1000/e1000_main.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.17-rc6-mm2/drivers/net/e1000/e1000_main.c === --- linux-2.6.17-rc6-mm2.orig/drivers/net/e1000/e1000_main.c2006-06-13 18:13:30.0 -0500 +++ linux-2.6.17-rc6-mm2/drivers/net/e1000/e1000_main.c 2006-06-23 11:27:47.0 -0500 @@ -4663,8 +4663,8 @@ static pci_ers_result_t e1000_io_slot_re } pci_set_master(pdev); - pci_enable_wake(pdev, 3, 0); - pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */ + pci_enable_wake(pdev, PCI_D3hot, 0); + pci_enable_wake(pdev, PCI_D3cold, 0); /* Perform card reset only on one instance of the card */ if (PCI_FUNC (pdev-devfn) != 0) - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
