ethtool: add suffix _u32 to legacy bitmap members of struct ethtool_keee

[linux-2.6-microblaze.git] / drivers / net / ethernet / intel / e1000e / ethtool.c

diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 343f54b..ff243ae 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -2223,16 +2223,16 @@ static int e1000e_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
        ret_val = e1000_read_emi_reg_locked(hw, cap_addr, &phy_data);
        if (ret_val)
                goto release;
-       edata->supported = mmd_eee_cap_to_ethtool_sup_t(phy_data);
+       edata->supported_u32 = mmd_eee_cap_to_ethtool_sup_t(phy_data);
 
        /* EEE Advertised */
-       edata->advertised = mmd_eee_adv_to_ethtool_adv_t(adapter->eee_advert);
+       edata->advertised_u32 = mmd_eee_adv_to_ethtool_adv_t(adapter->eee_advert);
 
        /* EEE Link Partner Advertised */
        ret_val = e1000_read_emi_reg_locked(hw, lpa_addr, &phy_data);
        if (ret_val)
                goto release;
-       edata->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(phy_data);
+       edata->lp_advertised_u32 = mmd_eee_adv_to_ethtool_adv_t(phy_data);
 
        /* EEE PCS Status */
        ret_val = e1000_read_emi_reg_locked(hw, pcs_stat_addr, &phy_data);
@@ -2283,12 +2283,12 @@ static int e1000e_set_eee(struct net_device *netdev, struct ethtool_keee *edata)
                return -EINVAL;
        }
 
-       if (edata->advertised & ~(ADVERTISE_100_FULL | ADVERTISE_1000_FULL)) {
+       if (edata->advertised_u32 & ~(ADVERTISE_100_FULL | ADVERTISE_1000_FULL)) {
                e_err("EEE advertisement supports only 100TX and/or 1000T full-duplex\n");
                return -EINVAL;
        }
 
-       adapter->eee_advert = ethtool_adv_to_mmd_eee_adv_t(edata->advertised);
+       adapter->eee_advert = ethtool_adv_to_mmd_eee_adv_t(edata->advertised_u32);
 
        hw->dev_spec.ich8lan.eee_disable = !edata->eee_enabled;