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

This is in preparation of using the existing names for linkmode
bitmaps.

Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
index be865776de55e8c4633d113d95edaa64bdfcde9e..0bd1a0a1ae6aff61b31673f0ab74727b306e715a 100644 (file)
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
@@ -713,14 +713,14 @@ static int aq_ethtool_get_eee(struct net_device *ndev, struct ethtool_keee *eee)
        if (err < 0)
                return err;
 
-       eee->supported = eee_mask_to_ethtool_mask(supported_rates);
+       eee->supported_u32 = eee_mask_to_ethtool_mask(supported_rates);
 
        if (aq_nic->aq_nic_cfg.eee_speeds)
-               eee->advertised = eee->supported;
+               eee->advertised_u32 = eee->supported_u32;
 
-       eee->lp_advertised = eee_mask_to_ethtool_mask(rate);
+       eee->lp_advertised_u32 = eee_mask_to_ethtool_mask(rate);
 
-       eee->eee_enabled = !!eee->advertised;
+       eee->eee_enabled = !!eee->advertised_u32;
 
        eee->tx_lpi_enabled = eee->eee_enabled;
        if ((supported_rates & rate) & AQ_NIC_RATE_EEE_MSK)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 12d2785eeb8a26b9aaa959919629a15368ca089f..5f0e1759d0788aae0d5181a3f2911453a1b9c756 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -2120,14 +2120,14 @@ static int bnx2x_get_eee(struct net_device *dev, struct ethtool_keee *edata)
 
        eee_cfg = bp->link_vars.eee_status;
 
-       edata->supported =
+       edata->supported_u32 =
                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_SUPPORTED_MASK) >>
                                 SHMEM_EEE_SUPPORTED_SHIFT);
 
-       edata->advertised =
+       edata->advertised_u32 =
                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_ADV_STATUS_MASK) >>
                                 SHMEM_EEE_ADV_STATUS_SHIFT);
-       edata->lp_advertised =
+       edata->lp_advertised_u32 =
                bnx2x_eee_to_adv((eee_cfg & SHMEM_EEE_LP_ADV_STATUS_MASK) >>
                                 SHMEM_EEE_LP_ADV_STATUS_SHIFT);
 
@@ -2162,7 +2162,7 @@ static int bnx2x_set_eee(struct net_device *dev, struct ethtool_keee *edata)
                return -EOPNOTSUPP;
        }
 
-       advertised = bnx2x_adv_to_eee(edata->advertised,
+       advertised = bnx2x_adv_to_eee(edata->advertised_u32,
                                      SHMEM_EEE_ADV_STATUS_SHIFT);
        if ((advertised != (eee_cfg & SHMEM_EEE_ADV_STATUS_MASK))) {
                DP(BNX2X_MSG_ETHTOOL,

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index d7626c26f9a9b41e2a1ea84c25bda11b17c56f0e..fde32b32fa81cf5e4303f4705126330c813c30e7 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -10624,7 +10624,7 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)
                struct ethtool_keee *eee = &bp->eee;
                u16 fw_speeds = le16_to_cpu(resp->supported_speeds_eee_mode);
 
-               eee->supported = _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
+               eee->supported_u32 = _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
                bp->lpi_tmr_lo = le32_to_cpu(resp->tx_lpi_timer_low) &
                                 PORT_PHY_QCAPS_RESP_TX_LPI_TIMER_LOW_MASK;
                bp->lpi_tmr_hi = le32_to_cpu(resp->valid_tx_lpi_timer_high) &
@@ -10775,7 +10775,7 @@ int bnxt_update_link(struct bnxt *bp, bool chng_link_state)
                        eee->eee_active = 1;
                        fw_speeds = le16_to_cpu(
                                resp->link_partner_adv_eee_link_speed_mask);
-                       eee->lp_advertised =
+                       eee->lp_advertised_u32 =
                                _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
                }
 
@@ -10786,7 +10786,7 @@ int bnxt_update_link(struct bnxt *bp, bool chng_link_state)
                                eee->eee_enabled = 1;
 
                        fw_speeds = le16_to_cpu(resp->adv_eee_link_speed_mask);
-                       eee->advertised =
+                       eee->advertised_u32 =
                                _bnxt_fw_to_ethtool_adv_spds(fw_speeds, 0);
 
                        if (resp->eee_config_phy_addr &
@@ -10969,7 +10969,7 @@ static void bnxt_hwrm_set_eee(struct bnxt *bp,
                        flags |= PORT_PHY_CFG_REQ_FLAGS_EEE_TX_LPI_DISABLE;
 
                req->flags |= cpu_to_le32(flags);
-               eee_speeds = bnxt_get_fw_auto_link_speeds(eee->advertised);
+               eee_speeds = bnxt_get_fw_auto_link_speeds(eee->advertised_u32);
                req->eee_link_speed_mask = cpu_to_le16(eee_speeds);
                req->tx_lpi_timer = cpu_to_le32(eee->tx_lpi_timer);
        } else {
@@ -11336,8 +11336,8 @@ static bool bnxt_eee_config_ok(struct bnxt *bp)
                        eee->eee_enabled = 0;
                        return false;
                }
-               if (eee->advertised & ~advertising) {
-                       eee->advertised = advertising & eee->supported;
+               if (eee->advertised_u32 & ~advertising) {
+                       eee->advertised_u32 = advertising & eee->supported_u32;
                        return false;
                }
        }

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index d6a8577d68af9f094da9572faeba71162464c578..481b835a7703ad1847fbb8d8cbc97dcd98286a40 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -3919,16 +3919,16 @@ static int bnxt_set_eee(struct net_device *dev, struct ethtool_keee *edata)
                        edata->tx_lpi_timer = eee->tx_lpi_timer;
                }
        }
-       if (!edata->advertised) {
-               edata->advertised = advertising & eee->supported;
-       } else if (edata->advertised & ~advertising) {
+       if (!edata->advertised_u32) {
+               edata->advertised_u32 = advertising & eee->supported_u32;
+       } else if (edata->advertised_u32 & ~advertising) {
                netdev_warn(dev, "EEE advertised %x must be a subset of autoneg advertised speeds %x\n",
-                           edata->advertised, advertising);
+                           edata->advertised_u32, advertising);
                rc = -EINVAL;
                goto eee_exit;
        }
 
-       eee->advertised = edata->advertised;
+       eee->advertised_u32 = edata->advertised_u32;
        eee->tx_lpi_enabled = edata->tx_lpi_enabled;
        eee->tx_lpi_timer = edata->tx_lpi_timer;
 eee_ok:
@@ -3954,12 +3954,12 @@ static int bnxt_get_eee(struct net_device *dev, struct ethtool_keee *edata)
                /* Preserve tx_lpi_timer so that the last value will be used
                 * by default when it is re-enabled.
                 */
-               edata->advertised = 0;
+               edata->advertised_u32 = 0;
                edata->tx_lpi_enabled = 0;
        }
 
        if (!bp->eee.eee_active)
-               edata->lp_advertised = 0;
+               edata->lp_advertised_u32 = 0;
 
        return 0;
 }

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 11054177c2eceec1a9442c1c3bf0a0d49c5493a8..f644a91317c9171bfad2a8c0ccac00dbe4822794 100644 (file)
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -2362,13 +2362,13 @@ static void tg3_eee_pull_config(struct tg3 *tp, struct ethtool_keee *eee)
        /* Pull lp advertised settings */
        if (tg3_phy_cl45_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE, &val))
                return;
-       dest->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(val);
+       dest->lp_advertised_u32 = mmd_eee_adv_to_ethtool_adv_t(val);
 
        /* Pull advertised and eee_enabled settings */
        if (tg3_phy_cl45_read(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, &val))
                return;
        dest->eee_enabled = !!val;
-       dest->advertised = mmd_eee_adv_to_ethtool_adv_t(val);
+       dest->advertised_u32 = mmd_eee_adv_to_ethtool_adv_t(val);
 
        /* Pull tx_lpi_enabled */
        val = tr32(TG3_CPMU_EEE_MODE);
@@ -4364,9 +4364,9 @@ static int tg3_phy_autoneg_cfg(struct tg3 *tp, u32 advertise, u32 flowctrl)
 
                if (!tp->eee.eee_enabled) {
                        val = 0;
-                       tp->eee.advertised = 0;
+                       tp->eee.advertised_u32 = 0;
                } else {
-                       tp->eee.advertised = advertise &
+                       tp->eee.advertised_u32 = advertise &
                                             (ADVERTISED_100baseT_Full |
                                              ADVERTISED_1000baseT_Full);
                }
@@ -4626,13 +4626,13 @@ static bool tg3_phy_eee_config_ok(struct tg3 *tp)
        tg3_eee_pull_config(tp, &eee);
 
        if (tp->eee.eee_enabled) {
-               if (tp->eee.advertised != eee.advertised ||
+               if (tp->eee.advertised_u32 != eee.advertised_u32 ||
                    tp->eee.tx_lpi_timer != eee.tx_lpi_timer ||
                    tp->eee.tx_lpi_enabled != eee.tx_lpi_enabled)
                        return false;
        } else {
                /* EEE is disabled but we're advertising */
-               if (eee.advertised)
+               if (eee.advertised_u32)
                        return false;
        }
 
@@ -14189,7 +14189,7 @@ static int tg3_set_eee(struct net_device *dev, struct ethtool_keee *edata)
                return -EOPNOTSUPP;
        }
 
-       if (edata->advertised != tp->eee.advertised) {
+       if (edata->advertised_u32 != tp->eee.advertised_u32) {
                netdev_warn(tp->dev,
                            "Direct manipulation of EEE advertisement is not supported\n");
                return -EINVAL;
@@ -15655,10 +15655,10 @@ static int tg3_phy_probe(struct tg3 *tp)
              tg3_chip_rev_id(tp) != CHIPREV_ID_57765_A0))) {
                tp->phy_flags |= TG3_PHYFLG_EEE_CAP;
 
-               tp->eee.supported = SUPPORTED_100baseT_Full |
-                                   SUPPORTED_1000baseT_Full;
-               tp->eee.advertised = ADVERTISED_100baseT_Full |
-                                    ADVERTISED_1000baseT_Full;
+               tp->eee.supported_u32 = SUPPORTED_100baseT_Full |
+                                       SUPPORTED_1000baseT_Full;
+               tp->eee.advertised_u32 = ADVERTISED_100baseT_Full |
+                                        ADVERTISED_1000baseT_Full;
                tp->eee.eee_enabled = 1;
                tp->eee.tx_lpi_enabled = 1;
                tp->eee.tx_lpi_timer = TG3_CPMU_DBTMR1_LNKIDLE_2047US;

diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index 343f54b2b6ae28758546fb65939c8d2c6660319d..ff243ae71b780b45d214f7f22dbc7aa2c9aa3ee1 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;
 

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 9dfda3c48af35a083aa5dad1c3f5a2c754ebfe1f..1b5473358e1a0a76271609ec4927b899c39849ee 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -5664,16 +5664,16 @@ static int i40e_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
        if (phy_cfg.eee_capability == 0)
                return -EOPNOTSUPP;
 
-       edata->supported = SUPPORTED_Autoneg;
-       edata->lp_advertised = edata->supported;
+       edata->supported_u32 = SUPPORTED_Autoneg;
+       edata->lp_advertised_u32 = edata->supported_u32;
 
        /* Get current configuration */
        status = i40e_aq_get_phy_capabilities(hw, false, false, &phy_cfg, NULL);
        if (status)
                return -EAGAIN;
 
-       edata->advertised = phy_cfg.eee_capability ? SUPPORTED_Autoneg : 0U;
-       edata->eee_enabled = !!edata->advertised;
+       edata->advertised_u32 = phy_cfg.eee_capability ? SUPPORTED_Autoneg : 0U;
+       edata->eee_enabled = !!edata->advertised_u32;
        edata->tx_lpi_enabled = pf->stats.tx_lpi_status;
 
        edata->eee_active = pf->stats.tx_lpi_status && pf->stats.rx_lpi_status;
@@ -5691,7 +5691,7 @@ static int i40e_is_eee_param_supported(struct net_device *netdev,
                u32 value;
                const char *name;
        } param[] = {
-               {edata->advertised & ~SUPPORTED_Autoneg, "advertise"},
+               {edata->advertised_u32 & ~SUPPORTED_Autoneg, "advertise"},
                {edata->tx_lpi_timer, "tx-timer"},
                {edata->tx_lpi_enabled != pf->stats.tx_lpi_status, "tx-lpi"}
        };

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 778d1e6cfc45dcb2ceeebb8753a44638582c6e6d..b87b23d2151c0dc294eb27ac0f05ee25ffe4919d 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -3038,10 +3038,10 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
            (hw->phy.media_type != e1000_media_type_copper))
                return -EOPNOTSUPP;
 
-       edata->supported = (SUPPORTED_1000baseT_Full |
-                           SUPPORTED_100baseT_Full);
+       edata->supported_u32 = (SUPPORTED_1000baseT_Full |
+                               SUPPORTED_100baseT_Full);
        if (!hw->dev_spec._82575.eee_disable)
-               edata->advertised =
+               edata->advertised_u32 =
                        mmd_eee_adv_to_ethtool_adv_t(adapter->eee_advert);
 
        /* The IPCNFG and EEER registers are not supported on I354. */
@@ -3068,7 +3068,7 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
                if (ret_val)
                        return -ENODATA;
 
-               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);
                break;
        case e1000_i354:
        case e1000_i210:
@@ -3079,7 +3079,7 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
                if (ret_val)
                        return -ENODATA;
 
-               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);
 
                break;
        default:
@@ -3099,7 +3099,7 @@ static int igb_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
                edata->eee_enabled = false;
                edata->eee_active = false;
                edata->tx_lpi_enabled = false;
-               edata->advertised &= ~edata->advertised;
+               edata->advertised_u32 &= ~edata->advertised_u32;
        }
 
        return 0;
@@ -3138,14 +3138,14 @@ static int igb_set_eee(struct net_device *netdev,
                        return -EINVAL;
                }
 
-               if (!edata->advertised || (edata->advertised &
+               if (!edata->advertised_u32 || (edata->advertised_u32 &
                    ~(ADVERTISE_100_FULL | ADVERTISE_1000_FULL))) {
                        dev_err(&adapter->pdev->dev,
                                "EEE Advertisement supports only 100Tx and/or 100T full duplex\n");
                        return -EINVAL;
                }
-               adv100m_eee = !!(edata->advertised & ADVERTISE_100_FULL);
-               adv1g_eee = !!(edata->advertised & ADVERTISE_1000_FULL);
+               adv100m_eee = !!(edata->advertised_u32 & ADVERTISE_100_FULL);
+               adv1g_eee = !!(edata->advertised_u32 & ADVERTISE_1000_FULL);
 
        } else if (!edata->eee_enabled) {
                dev_err(&adapter->pdev->dev,
@@ -3153,7 +3153,7 @@ static int igb_set_eee(struct net_device *netdev,
                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);
        if (hw->dev_spec._82575.eee_disable != !edata->eee_enabled) {
                hw->dev_spec._82575.eee_disable = !edata->eee_enabled;
                adapter->flags |= IGB_FLAG_EEE;

diff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c
index f2dcfe920f4f3b4aa3c36366b673197e0f017565..7f844e9674219f50576a9440b925b347b8e60be1 100644 (file)
--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c
+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c
@@ -1630,11 +1630,11 @@ static int igc_ethtool_get_eee(struct net_device *netdev,
        u32 eeer;
 
        if (hw->dev_spec._base.eee_enable)
-               edata->advertised =
+               edata->advertised_u32 =
                        mmd_eee_adv_to_ethtool_adv_t(adapter->eee_advert);
 
        *edata = adapter->eee;
-       edata->supported = SUPPORTED_Autoneg;
+       edata->supported_u32 = SUPPORTED_Autoneg;
 
        eeer = rd32(IGC_EEER);
 
@@ -1647,8 +1647,8 @@ static int igc_ethtool_get_eee(struct net_device *netdev,
 
        edata->eee_enabled = hw->dev_spec._base.eee_enable;
 
-       edata->advertised = SUPPORTED_Autoneg;
-       edata->lp_advertised = SUPPORTED_Autoneg;
+       edata->advertised_u32 = SUPPORTED_Autoneg;
+       edata->lp_advertised_u32 = SUPPORTED_Autoneg;
 
        /* Report correct negotiated EEE status for devices that
         * wrongly report EEE at half-duplex
@@ -1657,7 +1657,7 @@ static int igc_ethtool_get_eee(struct net_device *netdev,
                edata->eee_enabled = false;
                edata->eee_active = false;
                edata->tx_lpi_enabled = false;
-               edata->advertised &= ~edata->advertised;
+               edata->advertised_u32 &= ~edata->advertised_u32;
        }
 
        return 0;
@@ -1699,7 +1699,7 @@ static int igc_ethtool_set_eee(struct net_device *netdev,
                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);
        if (hw->dev_spec._base.eee_enable != edata->eee_enabled) {
                hw->dev_spec._base.eee_enable = edata->eee_enabled;
                adapter->flags |= IGC_FLAG_EEE;

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 0aa73519a29d39080b330279a9aff9f6fc1beb5f..ca69a8221793defa1571d32721b47cf395e6e8be 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -3436,27 +3436,27 @@ ixgbe_get_eee_fw(struct ixgbe_adapter *adapter, struct ethtool_keee *edata)
        if (rc)
                return rc;
 
-       edata->lp_advertised = 0;
+       edata->lp_advertised_u32 = 0;
        for (i = 0; i < ARRAY_SIZE(ixgbe_lp_map); ++i) {
                if (info[0] & ixgbe_lp_map[i].lp_advertised)
-                       edata->lp_advertised |= ixgbe_lp_map[i].mac_speed;
+                       edata->lp_advertised_u32 |= ixgbe_lp_map[i].mac_speed;
        }
 
-       edata->supported = 0;
+       edata->supported_u32 = 0;
        for (i = 0; i < ARRAY_SIZE(ixgbe_ls_map); ++i) {
                if (hw->phy.eee_speeds_supported & ixgbe_ls_map[i].mac_speed)
-                       edata->supported |= ixgbe_ls_map[i].supported;
+                       edata->supported_u32 |= ixgbe_ls_map[i].supported;
        }
 
-       edata->advertised = 0;
+       edata->advertised_u32 = 0;
        for (i = 0; i < ARRAY_SIZE(ixgbe_ls_map); ++i) {
                if (hw->phy.eee_speeds_advertised & ixgbe_ls_map[i].mac_speed)
-                       edata->advertised |= ixgbe_ls_map[i].supported;
+                       edata->advertised_u32 |= ixgbe_ls_map[i].supported;
        }
 
-       edata->eee_enabled = !!edata->advertised;
+       edata->eee_enabled = !!edata->advertised_u32;
        edata->tx_lpi_enabled = edata->eee_enabled;
-       if (edata->advertised & edata->lp_advertised)
+       if (edata->advertised_u32 & edata->lp_advertised_u32)
                edata->eee_active = true;
 
        return 0;
@@ -3504,7 +3504,7 @@ static int ixgbe_set_eee(struct net_device *netdev, struct ethtool_keee *edata)
                        return -EINVAL;
                }
 
-               if (eee_data.advertised != edata->advertised) {
+               if (eee_data.advertised_u32 != edata->advertised_u32) {
                        e_err(drv,
                              "Setting EEE advertised speeds is not supported\n");
                        return -EINVAL;

diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
index 77491fb640393075bd89eb915a33800d92fda47f..dfa15619fd782352c26091f503a4c992f4b54af7 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c
@@ -1790,17 +1790,17 @@ static int qede_get_eee(struct net_device *dev, struct ethtool_keee *edata)
        }
 
        if (current_link.eee.adv_caps & QED_EEE_1G_ADV)
-               edata->advertised = ADVERTISED_1000baseT_Full;
+               edata->advertised_u32 = ADVERTISED_1000baseT_Full;
        if (current_link.eee.adv_caps & QED_EEE_10G_ADV)
-               edata->advertised |= ADVERTISED_10000baseT_Full;
+               edata->advertised_u32 |= ADVERTISED_10000baseT_Full;
        if (current_link.sup_caps & QED_EEE_1G_ADV)
-               edata->supported = ADVERTISED_1000baseT_Full;
+               edata->supported_u32 = ADVERTISED_1000baseT_Full;
        if (current_link.sup_caps & QED_EEE_10G_ADV)
-               edata->supported |= ADVERTISED_10000baseT_Full;
+               edata->supported_u32 |= ADVERTISED_10000baseT_Full;
        if (current_link.eee.lp_adv_caps & QED_EEE_1G_ADV)
-               edata->lp_advertised = ADVERTISED_1000baseT_Full;
+               edata->lp_advertised_u32 = ADVERTISED_1000baseT_Full;
        if (current_link.eee.lp_adv_caps & QED_EEE_10G_ADV)
-               edata->lp_advertised |= ADVERTISED_10000baseT_Full;
+               edata->lp_advertised_u32 |= ADVERTISED_10000baseT_Full;
 
        edata->tx_lpi_timer = current_link.eee.tx_lpi_timer;
        edata->eee_enabled = current_link.eee.enable;
@@ -1832,20 +1832,20 @@ static int qede_set_eee(struct net_device *dev, struct ethtool_keee *edata)
        memset(&params, 0, sizeof(params));
        params.override_flags |= QED_LINK_OVERRIDE_EEE_CONFIG;
 
-       if (!(edata->advertised & (ADVERTISED_1000baseT_Full |
-                                  ADVERTISED_10000baseT_Full)) ||
-           ((edata->advertised & (ADVERTISED_1000baseT_Full |
-                                  ADVERTISED_10000baseT_Full)) !=
-            edata->advertised)) {
+       if (!(edata->advertised_u32 & (ADVERTISED_1000baseT_Full |
+                                      ADVERTISED_10000baseT_Full)) ||
+           ((edata->advertised_u32 & (ADVERTISED_1000baseT_Full |
+                                      ADVERTISED_10000baseT_Full)) !=
+            edata->advertised_u32)) {
                DP_VERBOSE(edev, QED_MSG_DEBUG,
                           "Invalid advertised capabilities %d\n",
-                          edata->advertised);
+                          edata->advertised_u32);
                return -EINVAL;
        }
 
-       if (edata->advertised & ADVERTISED_1000baseT_Full)
+       if (edata->advertised_u32 & ADVERTISED_1000baseT_Full)
                params.eee.adv_caps = QED_EEE_1G_ADV;
-       if (edata->advertised & ADVERTISED_10000baseT_Full)
+       if (edata->advertised_u32 & ADVERTISED_10000baseT_Full)
                params.eee.adv_caps |= QED_EEE_10G_ADV;
        params.eee.enable = edata->eee_enabled;
        params.eee.tx_lpi_enable = edata->tx_lpi_enabled;

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index adee5e712871fef174a121b548d99268a839a51d..99c84af257468cd1522e571a2e95fb490678cc3e 100644 (file)
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -1463,12 +1463,12 @@ int genphy_c45_ethtool_get_eee(struct phy_device *phydev,
        data->eee_enabled = is_enabled;
        data->eee_active = ret;
 
-       if (!ethtool_convert_link_mode_to_legacy_u32(&data->supported,
+       if (!ethtool_convert_link_mode_to_legacy_u32(&data->supported_u32,
                                                     phydev->supported_eee))
                overflow = true;
-       if (!ethtool_convert_link_mode_to_legacy_u32(&data->advertised, adv))
+       if (!ethtool_convert_link_mode_to_legacy_u32(&data->advertised_u32, adv))
                overflow = true;
-       if (!ethtool_convert_link_mode_to_legacy_u32(&data->lp_advertised, lp))
+       if (!ethtool_convert_link_mode_to_legacy_u32(&data->lp_advertised_u32, lp))
                overflow = true;
 
        if (overflow)
@@ -1495,11 +1495,11 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
        int ret;
 
        if (data->eee_enabled) {
-               if (data->advertised) {
+               if (data->advertised_u32) {
                        __ETHTOOL_DECLARE_LINK_MODE_MASK(adv);
 
                        ethtool_convert_legacy_u32_to_link_mode(adv,
-                                                               data->advertised);
+                                                               data->advertised_u32);
                        linkmode_andnot(adv, adv, phydev->supported_eee);
                        if (!linkmode_empty(adv)) {
                                phydev_warn(phydev, "At least some EEE link modes are not supported.\n");
@@ -1507,7 +1507,7 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
                        }
 
                        ethtool_convert_legacy_u32_to_link_mode(phydev->advertising_eee,
-                                                               data->advertised);
+                                                               data->advertised_u32);
                } else {
                        linkmode_copy(phydev->advertising_eee,
                                      phydev->supported_eee);

diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 3922a9afdd1fe0ede433e2d8c22495409a00f7fc..d6168eaa286fe0b2788a317597db046f8f7ce44b 100644 (file)
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -676,21 +676,21 @@ ax88179_ethtool_get_eee(struct usbnet *dev, struct ethtool_keee *data)
                                            MDIO_MMD_PCS);
        if (val < 0)
                return val;
-       data->supported = mmd_eee_cap_to_ethtool_sup_t(val);
+       data->supported_u32 = mmd_eee_cap_to_ethtool_sup_t(val);
 
        /* Get advertisement EEE */
        val = ax88179_phy_read_mmd_indirect(dev, MDIO_AN_EEE_ADV,
                                            MDIO_MMD_AN);
        if (val < 0)
                return val;
-       data->advertised = mmd_eee_adv_to_ethtool_adv_t(val);
+       data->advertised_u32 = mmd_eee_adv_to_ethtool_adv_t(val);
 
        /* Get LP advertisement EEE */
        val = ax88179_phy_read_mmd_indirect(dev, MDIO_AN_EEE_LPABLE,
                                            MDIO_MMD_AN);
        if (val < 0)
                return val;
-       data->lp_advertised = mmd_eee_adv_to_ethtool_adv_t(val);
+       data->lp_advertised_u32 = mmd_eee_adv_to_ethtool_adv_t(val);
 
        return 0;
 }
@@ -698,7 +698,7 @@ ax88179_ethtool_get_eee(struct usbnet *dev, struct ethtool_keee *data)
 static int
 ax88179_ethtool_set_eee(struct usbnet *dev, struct ethtool_keee *data)
 {
-       u16 tmp16 = ethtool_adv_to_mmd_eee_adv_t(data->advertised);
+       u16 tmp16 = ethtool_adv_to_mmd_eee_adv_t(data->advertised_u32);
 
        return ax88179_phy_write_mmd_indirect(dev, MDIO_AN_EEE_ADV,
                                              MDIO_MMD_AN, tmp16);
@@ -1663,7 +1663,7 @@ static int ax88179_reset(struct usbnet *dev)
        ax88179_disable_eee(dev);
 
        ax88179_ethtool_get_eee(dev, &eee_data);
-       eee_data.advertised = 0;
+       eee_data.advertised_u32 = 0;
        ax88179_ethtool_set_eee(dev, &eee_data);
 
        /* Restart autoneg */

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index dc163b766a8903aec0fcec614e27bfd91a811ae5..3d806b3ff4258f8489fe36f275aa9f3660b7fdc7 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -8938,16 +8938,16 @@ static int r8152_get_eee(struct r8152 *tp, struct ethtool_keee *eee)
 
        eee->eee_enabled = tp->eee_en;
        eee->eee_active = !!(supported & adv & lp);
-       eee->supported = supported;
-       eee->advertised = tp->eee_adv;
-       eee->lp_advertised = lp;
+       eee->supported_u32 = supported;
+       eee->advertised_u32 = tp->eee_adv;
+       eee->lp_advertised_u32 = lp;
 
        return 0;
 }
 
 static int r8152_set_eee(struct r8152 *tp, struct ethtool_keee *eee)
 {
-       u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
+       u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised_u32);
 
        tp->eee_en = eee->eee_enabled;
        tp->eee_adv = val;
@@ -8973,9 +8973,9 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_keee *eee)
 
        eee->eee_enabled = tp->eee_en;
        eee->eee_active = !!(supported & adv & lp);
-       eee->supported = supported;
-       eee->advertised = tp->eee_adv;
-       eee->lp_advertised = lp;
+       eee->supported_u32 = supported;
+       eee->advertised_u32 = tp->eee_adv;
+       eee->lp_advertised_u32 = lp;
 
        return 0;
 }

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 14549cb9e2b22e328eab48415a22d57b762ce40c..89807c30f5a7a6bf5543f3ca3c47dc7a82fd8a64 100644 (file)
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -223,9 +223,9 @@ __ethtool_get_link_ksettings(struct net_device *dev,
                             struct ethtool_link_ksettings *link_ksettings);
 
 struct ethtool_keee {
-       u32     supported;
-       u32     advertised;
-       u32     lp_advertised;
+       u32     supported_u32;
+       u32     advertised_u32;
+       u32     lp_advertised_u32;
        u32     tx_lpi_timer;
        bool    tx_lpi_enabled;
        bool    eee_active;

diff --git a/net/ethtool/eee.c b/net/ethtool/eee.c
index ac9f694ffe205f0bb0d5c865f6b2e32680057698..ca56f28173d50eaf4e29eb1b76259aa36ccf1de3 100644 (file)
--- a/net/ethtool/eee.c
+++ b/net/ethtool/eee.c
@@ -5,7 +5,7 @@
 #include "bitset.h"
 
 #define EEE_MODES_COUNT \
-       (sizeof_field(struct ethtool_keee, supported) * BITS_PER_BYTE)
+       (sizeof_field(struct ethtool_keee, supported_u32) * BITS_PER_BYTE)
 
 struct eee_req_info {
        struct ethnl_req_info           base;
@@ -52,19 +52,19 @@ static int eee_reply_size(const struct ethnl_req_info *req_base,
        int len = 0;
        int ret;
 
-       BUILD_BUG_ON(sizeof(eee->advertised) * BITS_PER_BYTE !=
+       BUILD_BUG_ON(sizeof(eee->advertised_u32) * BITS_PER_BYTE !=
                     EEE_MODES_COUNT);
-       BUILD_BUG_ON(sizeof(eee->lp_advertised) * BITS_PER_BYTE !=
+       BUILD_BUG_ON(sizeof(eee->lp_advertised_u32) * BITS_PER_BYTE !=
                     EEE_MODES_COUNT);
 
        /* MODES_OURS */
-       ret = ethnl_bitset32_size(&eee->advertised, &eee->supported,
+       ret = ethnl_bitset32_size(&eee->advertised_u32, &eee->supported_u32,
                                  EEE_MODES_COUNT, link_mode_names, compact);
        if (ret < 0)
                return ret;
        len += ret;
        /* MODES_PEERS */
-       ret = ethnl_bitset32_size(&eee->lp_advertised, NULL,
+       ret = ethnl_bitset32_size(&eee->lp_advertised_u32, NULL,
                                  EEE_MODES_COUNT, link_mode_names, compact);
        if (ret < 0)
                return ret;
@@ -88,12 +88,12 @@ static int eee_fill_reply(struct sk_buff *skb,
        int ret;
 
        ret = ethnl_put_bitset32(skb, ETHTOOL_A_EEE_MODES_OURS,
-                                &eee->advertised, &eee->supported,
+                                &eee->advertised_u32, &eee->supported_u32,
                                 EEE_MODES_COUNT, link_mode_names, compact);
        if (ret < 0)
                return ret;
        ret = ethnl_put_bitset32(skb, ETHTOOL_A_EEE_MODES_PEER,
-                                &eee->lp_advertised, NULL, EEE_MODES_COUNT,
+                                &eee->lp_advertised_u32, NULL, EEE_MODES_COUNT,
                                 link_mode_names, compact);
        if (ret < 0)
                return ret;
@@ -140,7 +140,7 @@ ethnl_set_eee(struct ethnl_req_info *req_info, struct genl_info *info)
        if (ret < 0)
                return ret;
 
-       ret = ethnl_update_bitset32(&eee.advertised, EEE_MODES_COUNT,
+       ret = ethnl_update_bitset32(&eee.advertised_u32, EEE_MODES_COUNT,
                                    tb[ETHTOOL_A_EEE_MODES_OURS],
                                    link_mode_names, info->extack, &mod);
        if (ret < 0)

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 46c29b369aeb0b641fcb4c2a25b1839e8bc59927..5b2ca72e3203705ed81bd816590d852b301a3971 100644 (file)
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -1513,9 +1513,9 @@ static void eee_to_keee(struct ethtool_keee *keee,
 {
        memset(keee, 0, sizeof(*keee));
 
-       keee->supported = eee->supported;
-       keee->advertised = eee->advertised;
-       keee->lp_advertised = eee->lp_advertised;
+       keee->supported_u32 = eee->supported;
+       keee->advertised_u32 = eee->advertised;
+       keee->lp_advertised_u32 = eee->lp_advertised;
        keee->eee_active = eee->eee_active;
        keee->eee_enabled = eee->eee_enabled;
        keee->tx_lpi_enabled = eee->tx_lpi_enabled;
@@ -1527,9 +1527,9 @@ static void keee_to_eee(struct ethtool_eee *eee,
 {
        memset(eee, 0, sizeof(*eee));
 
-       eee->supported = keee->supported;
-       eee->advertised = keee->advertised;
-       eee->lp_advertised = keee->lp_advertised;
+       eee->supported = keee->supported_u32;
+       eee->advertised = keee->advertised_u32;
+       eee->lp_advertised = keee->lp_advertised_u32;
        eee->eee_active = keee->eee_active;
        eee->eee_enabled = keee->eee_enabled;
        eee->tx_lpi_enabled = keee->tx_lpi_enabled;