e1000: Whitespace cleanup, cosmetic changes
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
This commit is contained in:
parent
699a712388
commit
8fc897b00a
5 changed files with 554 additions and 554 deletions
|
@ -709,7 +709,6 @@ e1000_set_ringparam(struct net_device *netdev,
|
|||
}
|
||||
|
||||
clear_bit(__E1000_RESETTING, &adapter->flags);
|
||||
|
||||
return 0;
|
||||
err_setup_tx:
|
||||
e1000_free_all_rx_resources(adapter);
|
||||
|
@ -894,16 +893,17 @@ e1000_intr_test(struct e1000_adapter *adapter, uint64_t *data)
|
|||
|
||||
*data = 0;
|
||||
|
||||
/* NOTE: we don't test MSI interrupts here, yet */
|
||||
/* Hook up test interrupt handler just for this test */
|
||||
if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
|
||||
netdev->name, netdev)) {
|
||||
netdev->name, netdev))
|
||||
shared_int = FALSE;
|
||||
} else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
|
||||
netdev->name, netdev)){
|
||||
else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
|
||||
netdev->name, netdev)) {
|
||||
*data = 1;
|
||||
return -1;
|
||||
}
|
||||
DPRINTK(PROBE,INFO, "testing %s interrupt\n",
|
||||
DPRINTK(HW, INFO, "testing %s interrupt\n",
|
||||
(shared_int ? "shared" : "unshared"));
|
||||
|
||||
/* Disable all the interrupts */
|
||||
|
@ -1269,11 +1269,10 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
|
|||
e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140);
|
||||
/* autoneg off */
|
||||
e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140);
|
||||
} else if (adapter->hw.phy_type == e1000_phy_gg82563) {
|
||||
} else if (adapter->hw.phy_type == e1000_phy_gg82563)
|
||||
e1000_write_phy_reg(&adapter->hw,
|
||||
GG82563_PHY_KMRN_MODE_CTRL,
|
||||
0x1CC);
|
||||
}
|
||||
|
||||
ctrl_reg = E1000_READ_REG(&adapter->hw, CTRL);
|
||||
|
||||
|
@ -1301,9 +1300,9 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
|
|||
}
|
||||
|
||||
if (adapter->hw.media_type == e1000_media_type_copper &&
|
||||
adapter->hw.phy_type == e1000_phy_m88) {
|
||||
adapter->hw.phy_type == e1000_phy_m88)
|
||||
ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */
|
||||
} else {
|
||||
else {
|
||||
/* Set the ILOS bit on the fiber Nic is half
|
||||
* duplex link is detected. */
|
||||
stat_reg = E1000_READ_REG(&adapter->hw, STATUS);
|
||||
|
@ -1439,11 +1438,10 @@ e1000_loopback_cleanup(struct e1000_adapter *adapter)
|
|||
case e1000_82546_rev_3:
|
||||
default:
|
||||
hw->autoneg = TRUE;
|
||||
if (hw->phy_type == e1000_phy_gg82563) {
|
||||
if (hw->phy_type == e1000_phy_gg82563)
|
||||
e1000_write_phy_reg(hw,
|
||||
GG82563_PHY_KMRN_MODE_CTRL,
|
||||
0x180);
|
||||
}
|
||||
e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
|
||||
if (phy_reg & MII_CR_LOOPBACK) {
|
||||
phy_reg &= ~MII_CR_LOOPBACK;
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -697,6 +697,7 @@ union e1000_rx_desc_packet_split {
|
|||
E1000_RXDEXT_STATERR_CXE | \
|
||||
E1000_RXDEXT_STATERR_RXE)
|
||||
|
||||
|
||||
/* Transmit Descriptor */
|
||||
struct e1000_tx_desc {
|
||||
uint64_t buffer_addr; /* Address of the descriptor's data buffer */
|
||||
|
@ -2172,7 +2173,7 @@ struct e1000_host_command_info {
|
|||
|
||||
#define E1000_MDALIGN 4096
|
||||
|
||||
/* PCI-Ex registers */
|
||||
/* PCI-Ex registers*/
|
||||
|
||||
/* PCI-Ex Control Register */
|
||||
#define E1000_GCR_RXD_NO_SNOOP 0x00000001
|
||||
|
|
|
@ -2439,11 +2439,10 @@ e1000_watchdog(unsigned long data)
|
|||
* disable receives in the ISR and
|
||||
* reset device here in the watchdog
|
||||
*/
|
||||
if (adapter->hw.mac_type == e1000_80003es2lan) {
|
||||
if (adapter->hw.mac_type == e1000_80003es2lan)
|
||||
/* reset device */
|
||||
schedule_work(&adapter->reset_task);
|
||||
}
|
||||
}
|
||||
|
||||
e1000_smartspeed(adapter);
|
||||
}
|
||||
|
@ -3677,7 +3676,7 @@ e1000_clean_rx_irq(struct e1000_adapter *adapter,
|
|||
E1000_DBG("%s: Receive packet consumed multiple"
|
||||
" buffers\n", netdev->name);
|
||||
/* recycle */
|
||||
buffer_info-> skb = skb;
|
||||
buffer_info->skb = skb;
|
||||
goto next_desc;
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue