net: convert users of bitmap_foo() to linkmode_foo()

[linux-2.6-block.git] / drivers / net / dsa / ocelot / felix_vsc9959.c

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 11b42fd812e4a9658edda1bf764704f12972d471..45c5ec7a83eafc66f84f1b8eff27499450d748b9 100644 (file)
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -943,7 +943,7 @@ static void vsc9959_phylink_validate(struct ocelot *ocelot, int port,
 
        if (state->interface != PHY_INTERFACE_MODE_NA &&
            state->interface != ocelot_port->phy_mode) {
-               bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
+               linkmode_zero(supported);
                return;
        }
 
@@ -965,10 +965,8 @@ static void vsc9959_phylink_validate(struct ocelot *ocelot, int port,
                phylink_set(mask, 2500baseX_Full);
        }
 
-       bitmap_and(supported, supported, mask,
-                  __ETHTOOL_LINK_MODE_MASK_NBITS);
-       bitmap_and(state->advertising, state->advertising, mask,
-                  __ETHTOOL_LINK_MODE_MASK_NBITS);
+       linkmode_and(supported, supported, mask);
+       linkmode_and(state->advertising, state->advertising, mask);
 }
 
 static int vsc9959_prevalidate_phy_mode(struct ocelot *ocelot, int port,