Commit b7e240b9 authored by Christopher Goldfarb's avatar Christopher Goldfarb Committed by Jeff Garzik

e1000 net drvr update 12/13:

Update a few stale comments
parent 2d41e4f1
...@@ -472,10 +472,6 @@ e1000_probe(struct pci_dev *pdev, ...@@ -472,10 +472,6 @@ e1000_probe(struct pci_dev *pdev,
* that it should release a PCI device. The could be caused by a * that it should release a PCI device. The could be caused by a
* Hot-Plug event, or because the driver is going to be removed from * Hot-Plug event, or because the driver is going to be removed from
* memory. * memory.
*
* This routine is also called to clean up from a failure in
* e1000_probe. The Adapter struct and netdev will always exist,
* all other pointers must be checked for NULL before freeing.
**/ **/
static void __devexit static void __devexit
...@@ -675,9 +671,6 @@ e1000_close(struct net_device *netdev) ...@@ -675,9 +671,6 @@ e1000_close(struct net_device *netdev)
* @adapter: board private structure * @adapter: board private structure
* *
* Return 0 on success, negative on failure * Return 0 on success, negative on failure
*
* e1000_setup_tx_resources allocates all software transmit resources
* and enabled the Tx unit of the MAC.
**/ **/
static int static int
...@@ -783,13 +776,10 @@ e1000_configure_tx(struct e1000_adapter *adapter) ...@@ -783,13 +776,10 @@ e1000_configure_tx(struct e1000_adapter *adapter)
} }
/** /**
* e1000_setup_rx_resources - allocate Rx resources (Descriptors, receive SKBs) * e1000_setup_rx_resources - allocate Rx resources (Descriptors)
* @adapter: board private structure * @adapter: board private structure
* *
* Returns 0 on success, negative on failure * Returns 0 on success, negative on failure
*
* e1000_setup_rx_resources allocates all software receive resources
* and network buffers, and enables the Rx unit of the MAC.
**/ **/
static int static int
...@@ -1728,7 +1718,6 @@ e1000_intr(int irq, void *data, struct pt_regs *regs) ...@@ -1728,7 +1718,6 @@ e1000_intr(int irq, void *data, struct pt_regs *regs)
while(i && (icr = E1000_READ_REG(&adapter->hw, ICR))) { while(i && (icr = E1000_READ_REG(&adapter->hw, ICR))) {
if(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) { if(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
/* run the watchdog ASAP */
adapter->hw.get_link_status = 1; adapter->hw.get_link_status = 1;
mod_timer(&adapter->watchdog_timer, jiffies); mod_timer(&adapter->watchdog_timer, jiffies);
} }
......
...@@ -152,7 +152,7 @@ E1000_PARAM(Duplex, "Duplex setting"); ...@@ -152,7 +152,7 @@ E1000_PARAM(Duplex, "Duplex setting");
/* Auto-negotiation Advertisement Override /* Auto-negotiation Advertisement Override
* *
* Valid Range: 0x00-0x0F, 0x20-0x2F * Valid Range: 0x01-0x0F, 0x20-0x2F
* *
* The AutoNeg value is a bit mask describing which speed and duplex * The AutoNeg value is a bit mask describing which speed and duplex
* combinations should be advertised during auto-negotiation. * combinations should be advertised during auto-negotiation.
......
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