diff options
Diffstat (limited to 'drivers/net/atl1e/atl1e_main.c')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index e28f8baf394..1ff001a8270 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c | |||
@@ -547,8 +547,8 @@ static int __devinit atl1e_sw_init(struct atl1e_adapter *adapter) | |||
547 | hw->device_id = pdev->device; | 547 | hw->device_id = pdev->device; |
548 | hw->subsystem_vendor_id = pdev->subsystem_vendor; | 548 | hw->subsystem_vendor_id = pdev->subsystem_vendor; |
549 | hw->subsystem_id = pdev->subsystem_device; | 549 | hw->subsystem_id = pdev->subsystem_device; |
550 | hw->revision_id = pdev->revision; | ||
550 | 551 | ||
551 | pci_read_config_byte(pdev, PCI_REVISION_ID, &hw->revision_id); | ||
552 | pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word); | 552 | pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word); |
553 | 553 | ||
554 | phy_status_data = AT_READ_REG(hw, REG_PHY_STATUS); | 554 | phy_status_data = AT_READ_REG(hw, REG_PHY_STATUS); |
@@ -932,11 +932,11 @@ static inline void atl1e_configure_tx(struct atl1e_adapter *adapter) | |||
932 | max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT)) & | 932 | max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_PAYLOAD_SHIFT)) & |
933 | DEVICE_CTRL_MAX_PAYLOAD_MASK; | 933 | DEVICE_CTRL_MAX_PAYLOAD_MASK; |
934 | 934 | ||
935 | hw->dmaw_block = min(max_pay_load, hw->dmaw_block); | 935 | hw->dmaw_block = min_t(u32, max_pay_load, hw->dmaw_block); |
936 | 936 | ||
937 | max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT)) & | 937 | max_pay_load = ((dev_ctrl_data >> DEVICE_CTRL_MAX_RREQ_SZ_SHIFT)) & |
938 | DEVICE_CTRL_MAX_RREQ_SZ_MASK; | 938 | DEVICE_CTRL_MAX_RREQ_SZ_MASK; |
939 | hw->dmar_block = min(max_pay_load, hw->dmar_block); | 939 | hw->dmar_block = min_t(u32, max_pay_load, hw->dmar_block); |
940 | 940 | ||
941 | if (hw->nic_type != athr_l2e_revB) | 941 | if (hw->nic_type != athr_l2e_revB) |
942 | AT_WRITE_REGW(hw, REG_TXQ_CTRL + 2, | 942 | AT_WRITE_REGW(hw, REG_TXQ_CTRL + 2, |
@@ -2051,9 +2051,9 @@ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state) | |||
2051 | atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data); | 2051 | atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data); |
2052 | atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data); | 2052 | atl1e_read_phy_reg(hw, MII_BMSR, (u16 *)&mii_bmsr_data); |
2053 | 2053 | ||
2054 | mii_advertise_data = MII_AR_10T_HD_CAPS; | 2054 | mii_advertise_data = ADVERTISE_10HALF; |
2055 | 2055 | ||
2056 | if ((atl1e_write_phy_reg(hw, MII_AT001_CR, 0) != 0) || | 2056 | if ((atl1e_write_phy_reg(hw, MII_CTRL1000, 0) != 0) || |
2057 | (atl1e_write_phy_reg(hw, | 2057 | (atl1e_write_phy_reg(hw, |
2058 | MII_ADVERTISE, mii_advertise_data) != 0) || | 2058 | MII_ADVERTISE, mii_advertise_data) != 0) || |
2059 | (atl1e_phy_commit(hw)) != 0) { | 2059 | (atl1e_phy_commit(hw)) != 0) { |