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

[linux-2.6-microblaze.git] / drivers / net / ethernet / broadcom / bnxt / bnxt_ethtool.c

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index d6a8577..481b835 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;
 }