1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/atl1c/atl1c_hw.c
index d8501f060957..23f2ab0f2fa8 100644
--- a/drivers/net/atl1c/atl1c_hw.c
+++ b/drivers/net/atl1c/atl1c_hw.c
@@ -82,7 +82,7 @@ static int atl1c_get_permanent_address(struct atl1c_hw *hw)
         addr[0] = addr[1] = 0;
         AT_READ_REG(hw, REG_OTP_CTRL, &otp_ctrl_data);
         if (atl1c_check_eeprom_exist(hw)) {
-                if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c_b) {
+                if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c) {
                         /* Enable OTP CLK */
                         if (!(otp_ctrl_data & OTP_CTRL_CLK_EN)) {
                                 otp_ctrl_data |= OTP_CTRL_CLK_EN;
@@ -345,7 +345,7 @@ int atl1c_write_phy_reg(struct atl1c_hw *hw, u32 reg_addr, u16 phy_data)
  */
 static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
 {
-        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_SPEED_MASK;
+        u16 mii_adv_data = ADVERTISE_DEFAULT_CAP & ~ADVERTISE_ALL;
         u16 mii_giga_ctrl_data = GIGA_CR_1000T_DEFAULT_CAP &
                                 ~GIGA_CR_1000T_SPEED_MASK;
 
@@ -373,7 +373,7 @@ static int atl1c_phy_setup_adv(struct atl1c_hw *hw)
         }
 
         if (atl1c_write_phy_reg(hw, MII_ADVERTISE, mii_adv_data) != 0 ||
-            atl1c_write_phy_reg(hw, MII_GIGA_CR, mii_giga_ctrl_data) != 0)
+            atl1c_write_phy_reg(hw, MII_CTRL1000, mii_giga_ctrl_data) != 0)
                 return -1;
         return 0;
 }
@@ -480,7 +480,7 @@ int atl1c_phy_reset(struct atl1c_hw *hw)
                 atl1c_write_phy_reg(hw, MII_DBG_DATA, 0x929D);
         }
         if (hw->nic_type == athr_l1c || hw->nic_type == athr_l2c_b2
-                || hw->nic_type == athr_l2c || hw->nic_type == athr_l2c) {
+                || hw->nic_type == athr_l2c) {
                 atl1c_write_phy_reg(hw, MII_DBG_ADDR, 0x29);
                 atl1c_write_phy_reg(hw, MII_DBG_DATA, 0xB6DD);
         }
@@ -517,19 +517,18 @@ int atl1c_phy_init(struct atl1c_hw *hw)
                                         "Error Setting up Auto-Negotiation\n");
                         return ret_val;
                 }
-                mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
+                mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
                 break;
         case MEDIA_TYPE_100M_FULL:
-                mii_bmcr_data |= BMCR_SPEED_100 | BMCR_FULL_DUPLEX;
+                mii_bmcr_data |= BMCR_SPEED100 | BMCR_FULLDPLX;
                 break;
         case MEDIA_TYPE_100M_HALF:
-                mii_bmcr_data |= BMCR_SPEED_100;
+                mii_bmcr_data |= BMCR_SPEED100;
                 break;
         case MEDIA_TYPE_10M_FULL:
-                mii_bmcr_data |= BMCR_SPEED_10 | BMCR_FULL_DUPLEX;
+                mii_bmcr_data |= BMCR_FULLDPLX;
                 break;
         case MEDIA_TYPE_10M_HALF:
-                mii_bmcr_data |= BMCR_SPEED_10;
                 break;
         default:
                 if (netif_msg_link(adapter))
@@ -657,7 +656,7 @@ int atl1c_restart_autoneg(struct atl1c_hw *hw)
         err = atl1c_phy_setup_adv(hw);
         if (err)
                 return err;
-        mii_bmcr_data |= BMCR_AUTO_NEG_EN | BMCR_RESTART_AUTO_NEG;
+        mii_bmcr_data |= BMCR_ANENABLE | BMCR_ANRESTART;
 
         return atl1c_write_phy_reg(hw, MII_BMCR, mii_bmcr_data);
 }