Commit e3dec99d authored by Scott Feldman's avatar Scott Feldman Committed by Linus Torvalds

[e1000] misc cleanup

* whitespace cleanup
* removal of unused members of netdev priv struct
* extendable arrangement of h/w reset logic
parent 981734a7
...@@ -224,6 +224,5 @@ struct e1000_adapter { ...@@ -224,6 +224,5 @@ struct e1000_adapter {
uint32_t pci_state[16]; uint32_t pci_state[16];
char ifname[IFNAMSIZ];
}; };
#endif /* _E1000_H_ */ #endif /* _E1000_H_ */
...@@ -294,10 +294,20 @@ e1000_reset_hw(struct e1000_hw *hw) ...@@ -294,10 +294,20 @@ e1000_reset_hw(struct e1000_hw *hw)
msec_delay(5); msec_delay(5);
} }
if(hw->mac_type > e1000_82543) switch(hw->mac_type) {
case e1000_82544:
case e1000_82540:
case e1000_82545:
case e1000_82546:
case e1000_82541:
/* These controllers can't ack the 64-bit write when issuing the
* reset, so use IO-mapping as a workaround to issue the reset */
E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST)); E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST));
else break;
default:
E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST)); E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST));
break;
}
/* Force a reload from the EEPROM if necessary */ /* Force a reload from the EEPROM if necessary */
if(hw->mac_type < e1000_82540) { if(hw->mac_type < e1000_82540) {
...@@ -722,7 +732,8 @@ e1000_setup_fiber_link(struct e1000_hw *hw) ...@@ -722,7 +732,8 @@ e1000_setup_fiber_link(struct e1000_hw *hw)
static int32_t static int32_t
e1000_setup_copper_link(struct e1000_hw *hw) e1000_setup_copper_link(struct e1000_hw *hw)
{ {
uint32_t ctrl, led_ctrl; uint32_t ctrl;
uint32_t led_ctrl;
int32_t ret_val; int32_t ret_val;
uint16_t i; uint16_t i;
uint16_t phy_data; uint16_t phy_data;
...@@ -2284,7 +2295,8 @@ e1000_write_phy_reg(struct e1000_hw *hw, ...@@ -2284,7 +2295,8 @@ e1000_write_phy_reg(struct e1000_hw *hw,
void void
e1000_phy_hw_reset(struct e1000_hw *hw) e1000_phy_hw_reset(struct e1000_hw *hw)
{ {
uint32_t ctrl, ctrl_ext, led_ctrl; uint32_t ctrl, ctrl_ext;
uint32_t led_ctrl;
DEBUGFUNC("e1000_phy_hw_reset"); DEBUGFUNC("e1000_phy_hw_reset");
......
...@@ -29,6 +29,14 @@ ...@@ -29,6 +29,14 @@
#include "e1000.h" #include "e1000.h"
/* Change Log /* Change Log
*
* 5.1.13 5/28/03
* o Bug fix: request_irq() failure resulted in freeing resources twice!
* [Don Fry (brazilnut@us.ibm.com)]
* o Bug fix: fix VLAN support on ppc64 [Mark Rakes (mrakes@vivato.net)]
* o Bug fix: missing Tx cleanup opportunities during interrupt handling.
* o Bug fix: alloc_etherdev failure didn't cleanup regions in probe.
* o Cleanup: s/int/unsigned int/ for descriptor ring indexes.
* *
* 5.1.11 5/6/03 * 5.1.11 5/6/03
* o Feature: Added support for 82546EB (Quad-port) hardware. * o Feature: Added support for 82546EB (Quad-port) hardware.
...@@ -38,26 +46,11 @@ ...@@ -38,26 +46,11 @@
* o Bug fix: TSO bug fixes. * o Bug fix: TSO bug fixes.
* *
* 5.0.42 3/5/03 * 5.0.42 3/5/03
* o Feature: Added support for 82541 and 82547 hardware.
* o Feature: Added support for Intel Gigabit PHY (IGP) and a variety of
* eeproms.
* o Feature: Added support for TCP Segmentation Offload (TSO).
* o Feature: Added MII ioctl.
* o Feature: Added support for statistics reporting through ethtool.
* o Cleanup: Removed proprietary hooks for ANS.
* o Cleanup: Miscellaneous code changes to improve CPU utilization.
* - Replaced "%" with conditionals and "+-" operators.
* - Implemented dynamic Interrupt Throttle Rate (ITR).
* - Reduced expensive PCI reads of ICR in interrupt.
* o Bug fix: Request IRQ after descriptor ring setup to avoid panic in
* shared interrupt instances.
*
* 4.4.18 11/27/02
*/ */
char e1000_driver_name[] = "e1000"; char e1000_driver_name[] = "e1000";
char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver"; char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
char e1000_driver_version[] = "5.1.11-k1"; char e1000_driver_version[] = "5.1.13-k1";
char e1000_copyright[] = "Copyright (c) 1999-2003 Intel Corporation."; char e1000_copyright[] = "Copyright (c) 1999-2003 Intel Corporation.";
/* e1000_pci_tbl - PCI Device ID Table /* e1000_pci_tbl - PCI Device ID Table
...@@ -128,6 +121,7 @@ static void e1000_update_stats(struct e1000_adapter *adapter); ...@@ -128,6 +121,7 @@ static void e1000_update_stats(struct e1000_adapter *adapter);
static inline void e1000_irq_disable(struct e1000_adapter *adapter); static inline void e1000_irq_disable(struct e1000_adapter *adapter);
static inline void e1000_irq_enable(struct e1000_adapter *adapter); static inline void e1000_irq_enable(struct e1000_adapter *adapter);
static irqreturn_t e1000_intr(int irq, void *data, struct pt_regs *regs); static irqreturn_t e1000_intr(int irq, void *data, struct pt_regs *regs);
static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter);
#ifdef CONFIG_E1000_NAPI #ifdef CONFIG_E1000_NAPI
static int e1000_clean(struct net_device *netdev, int *budget); static int e1000_clean(struct net_device *netdev, int *budget);
static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter, static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
...@@ -135,7 +129,6 @@ static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter, ...@@ -135,7 +129,6 @@ static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter,
#else #else
static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter); static boolean_t e1000_clean_rx_irq(struct e1000_adapter *adapter);
#endif #endif
static boolean_t e1000_clean_tx_irq(struct e1000_adapter *adapter);
static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter); static void e1000_alloc_rx_buffers(struct e1000_adapter *adapter);
static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd); static int e1000_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);
static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment