* [patch 8/8 2.5] e1000 - White space changes, driver version number update and others
@ 2004-09-17 9:58 Ganesh Venkatesan
2004-09-17 15:00 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Ganesh Venkatesan @ 2004-09-17 9:58 UTC (permalink / raw)
To: jgarzik; +Cc: ganesh.venkatesan, netdev
diff -up linux-2.5/drivers/net/e1000/e1000_ethtool.c linux-2.5/drivers/net/e1000.new/e1000_ethtool.c
--- linux-2.5/drivers/net/e1000/e1000_ethtool.c 2004-09-09 11:17:11.000000000 -0700
+++ linux-2.5/drivers/net/e1000.new/e1000_ethtool.c 2004-09-09 11:17:12.000000000 -0700
@@ -637,7 +637,6 @@ err_setup_rx:
return err;
}
-
#define REG_PATTERN_TEST(R, M, W) \
{ \
uint32_t pat, value; \
diff -up linux-2.5/drivers/net/e1000/e1000.h linux-2.5/drivers/net/e1000.new/e1000.h
--- linux-2.5/drivers/net/e1000/e1000.h 2004-09-09 11:17:11.000000000 -0700
+++ linux-2.5/drivers/net/e1000.new/e1000.h 2004-09-09 11:17:12.000000000 -0700
@@ -75,6 +75,8 @@
#define BAR_0 0
#define BAR_1 1
#define BAR_5 5
+#define PCI_DMA_64BIT 0xffffffffffffffffULL
+#define PCI_DMA_32BIT 0x00000000ffffffffULL
#define INTEL_E1000_ETHERNET_DEVICE(device_id) {\
PCI_DEVICE(PCI_VENDOR_ID_INTEL, device_id)}
diff -up linux-2.5/drivers/net/e1000/e1000_main.c linux-2.5/drivers/net/e1000.new/e1000_main.c
--- linux-2.5/drivers/net/e1000/e1000_main.c 2004-09-09 11:17:11.000000000 -0700
+++ linux-2.5/drivers/net/e1000.new/e1000_main.c 2004-09-09 11:17:12.000000000 -0700
@@ -48,7 +48,7 @@ char e1000_driver_string[] = "Intel(R) P
#else
#define DRIVERNAPI "-NAPI"
#endif
-char e1000_driver_version[] = "5.3.19-k2"DRIVERNAPI;
+char e1000_driver_version[] = "5.4.11"DRIVERNAPI;
char e1000_copyright[] = "Copyright (c) 1999-2004 Intel Corporation.";
/* e1000_pci_tbl - PCI Device ID Table
@@ -386,10 +386,10 @@ e1000_probe(struct pci_dev *pdev,
if((err = pci_enable_device(pdev)))
return err;
- if(!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {
+ if(!(err = pci_set_dma_mask(pdev, PCI_DMA_64BIT))) {
pci_using_dac = 1;
} else {
- if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
+ if((err = pci_set_dma_mask(pdev, PCI_DMA_32BIT))) {
E1000_ERR("No usable DMA configuration, aborting\n");
return err;
}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [patch 8/8 2.5] e1000 - White space changes, driver version number update and others
2004-09-17 9:58 [patch 8/8 2.5] e1000 - White space changes, driver version number update and others Ganesh Venkatesan
@ 2004-09-17 15:00 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2004-09-17 15:00 UTC (permalink / raw)
To: Ganesh Venkatesan; +Cc: netdev
> @@ -386,10 +386,10 @@ e1000_probe(struct pci_dev *pdev,
> if((err = pci_enable_device(pdev)))
> return err;
>
> - if(!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {
> + if(!(err = pci_set_dma_mask(pdev, PCI_DMA_64BIT))) {
> pci_using_dac = 1;
> } else {
> - if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
> + if((err = pci_set_dma_mask(pdev, PCI_DMA_32BIT))) {
> E1000_ERR("No usable DMA configuration, aborting\n");
> return err;
> }
>
>
>
>
Applied patches 1-2 and patches 4-7 to 2.6.x.
Patch #8 (quoted above) is rejected because DMA_..BIT_MASK is the
preferred method for 2.6.x kernels. The above patch is a regression.
Patch #3 is rejected because of an email problem:
> bk import -tpatch -CR -ye1000 - Fix MODULE_PARM, module_param and /tmp/patch25004 .
> patch: **** malformed patch at line 62: }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-09-17 15:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-17 9:58 [patch 8/8 2.5] e1000 - White space changes, driver version number update and others Ganesh Venkatesan
2004-09-17 15:00 ` Jeff Garzik
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).