* [patch 2.6.14-rc4] e1000: Driver version, white space, comments, device id & other
@ 2005-10-19 1:31 John W. Linville
2005-10-19 2:24 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: John W. Linville @ 2005-10-19 1:31 UTC (permalink / raw)
To: linux-kernel, netdev
Cc: jgarzik, john.ronciak, ganesh.venkatesan, mallikarjuna.chilakala
From: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Driver version, white space, comments, device id & other
Originally posted on 8/31 (and perhaps before)...I think it has not
been committed because the patch from that posting was damaged. I'm
reposting to make sure it gets in... :-)
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/e1000/e1000_main.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -43,7 +43,7 @@ char e1000_driver_string[] = "Intel(R) P
#else
#define DRIVERNAPI "-NAPI"
#endif
-#define DRV_VERSION "6.0.60-k2"DRIVERNAPI
+#define DRV_VERSION "6.1.16-k2"DRIVERNAPI
char e1000_driver_version[] = DRV_VERSION;
char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
@@ -80,6 +80,9 @@ static struct pci_device_id e1000_pci_tb
INTEL_E1000_ETHERNET_DEVICE(0x1026),
INTEL_E1000_ETHERNET_DEVICE(0x1027),
INTEL_E1000_ETHERNET_DEVICE(0x1028),
+ INTEL_E1000_ETHERNET_DEVICE(0x105E),
+ INTEL_E1000_ETHERNET_DEVICE(0x105F),
+ INTEL_E1000_ETHERNET_DEVICE(0x1060),
INTEL_E1000_ETHERNET_DEVICE(0x1075),
INTEL_E1000_ETHERNET_DEVICE(0x1076),
INTEL_E1000_ETHERNET_DEVICE(0x1077),
@@ -88,10 +91,13 @@ static struct pci_device_id e1000_pci_tb
INTEL_E1000_ETHERNET_DEVICE(0x107A),
INTEL_E1000_ETHERNET_DEVICE(0x107B),
INTEL_E1000_ETHERNET_DEVICE(0x107C),
+ INTEL_E1000_ETHERNET_DEVICE(0x107D),
+ INTEL_E1000_ETHERNET_DEVICE(0x107E),
+ INTEL_E1000_ETHERNET_DEVICE(0x107F),
INTEL_E1000_ETHERNET_DEVICE(0x108A),
INTEL_E1000_ETHERNET_DEVICE(0x108B),
INTEL_E1000_ETHERNET_DEVICE(0x108C),
- INTEL_E1000_ETHERNET_DEVICE(0x1099),
+ INTEL_E1000_ETHERNET_DEVICE(0x109A),
/* required last entry */
{0,}
};
@@ -366,8 +372,7 @@ e1000_down(struct e1000_adapter *adapter
e1000_clean_tx_ring(adapter);
e1000_clean_rx_ring(adapter);
- /* If WoL is not enabled
- * and management mode is not IAMT
+ /* If WoL is not enabled and management mode is not IAMT
* Power down the PHY so no link is implied when interface is down */
if(!adapter->wol && adapter->hw.mac_type >= e1000_82540 &&
adapter->hw.media_type == e1000_media_type_copper &&
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch 2.6.14-rc4] e1000: Driver version, white space, comments, device id & other
2005-10-19 1:31 [patch 2.6.14-rc4] e1000: Driver version, white space, comments, device id & other John W. Linville
@ 2005-10-19 2:24 ` Jeff Garzik
2005-10-19 14:31 ` John W. Linville
0 siblings, 1 reply; 5+ messages in thread
From: Jeff Garzik @ 2005-10-19 2:24 UTC (permalink / raw)
To: John W. Linville
Cc: linux-kernel, netdev, john.ronciak, ganesh.venkatesan,
mallikarjuna.chilakala
John W. Linville wrote:
> From: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
>
> Driver version, white space, comments, device id & other
>
> Originally posted on 8/31 (and perhaps before)...I think it has not
> been committed because the patch from that posting was damaged. I'm
> reposting to make sure it gets in... :-)
>
> Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
> Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
> Signed-off-by: John Ronciak <john.ronciak@intel.com>
>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
patch is ok, but doesn't apply to 'upstream' branch of netdev-2.6.git,
which has several e1000 patches in it.
Jeff
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch 2.6.14-rc4] e1000: Driver version, white space, comments, device id & other
2005-10-19 2:24 ` Jeff Garzik
@ 2005-10-19 14:31 ` John W. Linville
2005-10-19 14:40 ` [patch netdev-2.6] " John W. Linville
0 siblings, 1 reply; 5+ messages in thread
From: John W. Linville @ 2005-10-19 14:31 UTC (permalink / raw)
To: Jeff Garzik
Cc: linux-kernel, netdev, john.ronciak, ganesh.venkatesan,
mallikarjuna.chilakala
On Tue, Oct 18, 2005 at 10:24:34PM -0400, Jeff Garzik wrote:
> John W. Linville wrote:
> >From: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
> >
> >Driver version, white space, comments, device id & other
> patch is ok, but doesn't apply to 'upstream' branch of netdev-2.6.git,
> which has several e1000 patches in it.
I see...looks like some fuzz...I'll rediff and repost...
John
--
John W. Linville
linville@tuxdriver.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [patch netdev-2.6] e1000: Driver version, white space, comments, device id & other
2005-10-19 14:31 ` John W. Linville
@ 2005-10-19 14:40 ` John W. Linville
2005-10-20 14:07 ` Jeff Garzik
0 siblings, 1 reply; 5+ messages in thread
From: John W. Linville @ 2005-10-19 14:40 UTC (permalink / raw)
To: linux-kernel, netdev
Cc: jgarzik, john.ronciak, ganesh.venkatesan, mallikarjuna.chilakala
From: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Driver version, white space, comments, device id & other
Originally posted on 8/31 (and perhaps before)...I think it has not
been committed because the patch from that posting was damaged. I'm
reposting to make sure it gets in... :-)
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/e1000/e1000_main.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -43,7 +43,7 @@ char e1000_driver_string[] = "Intel(R) P
#else
#define DRIVERNAPI "-NAPI"
#endif
-#define DRV_VERSION "6.0.60-k2"DRIVERNAPI
+#define DRV_VERSION "6.1.16-k2"DRIVERNAPI
char e1000_driver_version[] = DRV_VERSION;
char e1000_copyright[] = "Copyright (c) 1999-2005 Intel Corporation.";
@@ -80,6 +80,9 @@ static struct pci_device_id e1000_pci_tb
INTEL_E1000_ETHERNET_DEVICE(0x1026),
INTEL_E1000_ETHERNET_DEVICE(0x1027),
INTEL_E1000_ETHERNET_DEVICE(0x1028),
+ INTEL_E1000_ETHERNET_DEVICE(0x105E),
+ INTEL_E1000_ETHERNET_DEVICE(0x105F),
+ INTEL_E1000_ETHERNET_DEVICE(0x1060),
INTEL_E1000_ETHERNET_DEVICE(0x1075),
INTEL_E1000_ETHERNET_DEVICE(0x1076),
INTEL_E1000_ETHERNET_DEVICE(0x1077),
@@ -88,10 +91,13 @@ static struct pci_device_id e1000_pci_tb
INTEL_E1000_ETHERNET_DEVICE(0x107A),
INTEL_E1000_ETHERNET_DEVICE(0x107B),
INTEL_E1000_ETHERNET_DEVICE(0x107C),
+ INTEL_E1000_ETHERNET_DEVICE(0x107D),
+ INTEL_E1000_ETHERNET_DEVICE(0x107E),
+ INTEL_E1000_ETHERNET_DEVICE(0x107F),
INTEL_E1000_ETHERNET_DEVICE(0x108A),
INTEL_E1000_ETHERNET_DEVICE(0x108B),
INTEL_E1000_ETHERNET_DEVICE(0x108C),
- INTEL_E1000_ETHERNET_DEVICE(0x1099),
+ INTEL_E1000_ETHERNET_DEVICE(0x109A),
/* required last entry */
{0,}
};
@@ -398,8 +404,7 @@ e1000_down(struct e1000_adapter *adapter
e1000_clean_all_tx_rings(adapter);
e1000_clean_all_rx_rings(adapter);
- /* If WoL is not enabled
- * and management mode is not IAMT
+ /* If WoL is not enabled and management mode is not IAMT
* Power down the PHY so no link is implied when interface is down */
if(!adapter->wol && adapter->hw.mac_type >= e1000_82540 &&
adapter->hw.media_type == e1000_media_type_copper &&
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [patch netdev-2.6] e1000: Driver version, white space, comments, device id & other
2005-10-19 14:40 ` [patch netdev-2.6] " John W. Linville
@ 2005-10-20 14:07 ` Jeff Garzik
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Garzik @ 2005-10-20 14:07 UTC (permalink / raw)
To: John W. Linville
Cc: linux-kernel, netdev, john.ronciak, ganesh.venkatesan,
mallikarjuna.chilakala
applied
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2005-10-20 14:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-10-19 1:31 [patch 2.6.14-rc4] e1000: Driver version, white space, comments, device id & other John W. Linville
2005-10-19 2:24 ` Jeff Garzik
2005-10-19 14:31 ` John W. Linville
2005-10-19 14:40 ` [patch netdev-2.6] " John W. Linville
2005-10-20 14:07 ` 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).