* [patch 1/5 2.4] e1000 - remove support for advanced TCO features
@ 2004-09-17 9:55 Ganesh Venkatesan
2004-09-17 15:27 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Ganesh Venkatesan @ 2004-09-17 9:55 UTC (permalink / raw)
To: jgarzik; +Cc: ganesh.venkatesan, netdev
diff -up linux-2.4/drivers/net/e1000/e1000_main.c linux-2.4/drivers/net/e1000.new/e1000_main.c
--- linux-2.4/drivers/net/e1000/e1000_main.c 2004-09-16 08:09:07.000000000 -0700
+++ linux-2.4/drivers/net/e1000.new/e1000_main.c 2004-09-16 08:09:08.000000000 -0700
@@ -339,7 +339,8 @@ e1000_down(struct e1000_adapter *adapter
void
e1000_reset(struct e1000_adapter *adapter)
{
- uint32_t pba, manc;
+ uint32_t pba;
+
/* Repartition Pba for greater than 9k mtu
* To take effect CTRL.RST is required.
*/
@@ -382,12 +338,6 @@ e1000_reset(struct e1000_adapter *adapte
e1000_reset_adaptive(&adapter->hw);
e1000_phy_get_info(&adapter->hw, &adapter->phy_info);
-
- if(adapter->en_mng_pt) {
- manc = E1000_READ_REG(&adapter->hw, MANC);
- manc |= (E1000_MANC_ARP_EN | E1000_MANC_EN_MNG2HOST);
- E1000_WRITE_REG(&adapter->hw, MANC, manc);
- }
}
/**
@@ -523,8 +488,6 @@ e1000_probe(struct pci_dev *pdev,
if(pci_using_dac)
netdev->features |= NETIF_F_HIGHDMA;
- adapter->en_mng_pt = e1000_enable_mng_pass_thru(&adapter->hw);
-
/* before reading the EEPROM, reset the controller to
* put the device in a known good starting state */
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 1/5 2.4] e1000 - remove support for advanced TCO features
2004-09-17 9:55 [patch 1/5 2.4] e1000 - remove support for advanced TCO features Ganesh Venkatesan
@ 2004-09-17 15:27 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2004-09-17 15:27 UTC (permalink / raw)
To: Ganesh Venkatesan; +Cc: netdev
applied patches 1-5 to 2.4.x
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-09-17 15:27 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:55 [patch 1/5 2.4] e1000 - remove support for advanced TCO features Ganesh Venkatesan
2004-09-17 15:27 ` 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).