net: ethtool: export conversion function between u32 and link mode

The function convert_legacy_u32_to_link_mode and
convert_link_mode_to_legacy_u32 may be used outside
of ethtool.c. We rename them to ethtool_convert_...
and export them, so we could use them in others
drivers and modules.

Signed-off-by: Philippe Reynes <tremyfr@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index e2b7bf27c03ef3ea8ec089a02fc735b78b5c0072..9ded8c6d8176b909cf68da0e125eef4441b7c9a9 100644 (file)
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -150,6 +150,13 @@ extern int
 __ethtool_get_link_ksettings(struct net_device *dev,
                             struct ethtool_link_ksettings *link_ksettings);
 
+void ethtool_convert_legacy_u32_to_link_mode(unsigned long *dst,
+                                            u32 legacy_u32);
+
+/* return false if src had higher bits set. lower bits always updated. */
+bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
+                                    const unsigned long *src);
+
 /**
  * struct ethtool_ops - optional netdev operations
  * @get_settings: DEPRECATED, use %get_link_ksettings/%set_link_ksettings

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index e0cf20a3b3dd840822b17a9795b254476640d28e..bdb4013581b1ada73a5957f250c821cca1efb65d 100644 (file)
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -391,15 +391,17 @@ static int __ethtool_set_flags(struct net_device *dev, u32 data)
        return 0;
 }
 
-static void convert_legacy_u32_to_link_mode(unsigned long *dst, u32 legacy_u32)
+void ethtool_convert_legacy_u32_to_link_mode(unsigned long *dst,
+                                            u32 legacy_u32)
 {
        bitmap_zero(dst, __ETHTOOL_LINK_MODE_MASK_NBITS);
        dst[0] = legacy_u32;
 }
+EXPORT_SYMBOL(ethtool_convert_legacy_u32_to_link_mode);
 
 /* return false if src had higher bits set. lower bits always updated. */
-static bool convert_link_mode_to_legacy_u32(u32 *legacy_u32,
-                                           const unsigned long *src)
+bool ethtool_convert_link_mode_to_legacy_u32(u32 *legacy_u32,
+                                            const unsigned long *src)
 {
        bool retval = true;
 
@@ -419,6 +421,7 @@ static bool convert_link_mode_to_legacy_u32(u32 *legacy_u32,
        *legacy_u32 = src[0];
        return retval;
 }
+EXPORT_SYMBOL(ethtool_convert_link_mode_to_legacy_u32);
 
 /* return false if legacy contained non-0 deprecated fields
  * transceiver/maxtxpkt/maxrxpkt. rest of ksettings always updated
@@ -441,13 +444,13 @@ convert_legacy_settings_to_link_ksettings(
            legacy_settings->maxrxpkt)
                retval = false;
 
-       convert_legacy_u32_to_link_mode(
+       ethtool_convert_legacy_u32_to_link_mode(
                link_ksettings->link_modes.supported,
                legacy_settings->supported);
-       convert_legacy_u32_to_link_mode(
+       ethtool_convert_legacy_u32_to_link_mode(
                link_ksettings->link_modes.advertising,
                legacy_settings->advertising);
-       convert_legacy_u32_to_link_mode(
+       ethtool_convert_legacy_u32_to_link_mode(
                link_ksettings->link_modes.lp_advertising,
                legacy_settings->lp_advertising);
        link_ksettings->base.speed
@@ -486,13 +489,13 @@ convert_link_ksettings_to_legacy_settings(
         * __u32        maxrxpkt;
         */
 
-       retval &= convert_link_mode_to_legacy_u32(
+       retval &= ethtool_convert_link_mode_to_legacy_u32(
                &legacy_settings->supported,
                link_ksettings->link_modes.supported);
-       retval &= convert_link_mode_to_legacy_u32(
+       retval &= ethtool_convert_link_mode_to_legacy_u32(
                &legacy_settings->advertising,
                link_ksettings->link_modes.advertising);
-       retval &= convert_link_mode_to_legacy_u32(
+       retval &= ethtool_convert_link_mode_to_legacy_u32(
                &legacy_settings->lp_advertising,
                link_ksettings->link_modes.lp_advertising);
        ethtool_cmd_speed_set(legacy_settings, link_ksettings->base.speed);