Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54638c6e authored by Denis Efremov's avatar Denis Efremov Committed by David S. Miller
Browse files

net: phy: make exported variables non-static 



The variables phy_basic_ports_array, phy_fibre_port_array and
phy_all_ports_features_array are declared static and marked
EXPORT_SYMBOL_GPL(), which is at best an odd combination.
Because the variables were decided to be a part of API, this commit
removes the static attributes and adds the declarations to the header.

Fixes: 3c1bcc86 ("net: ethernet: Convert phydev advertize and supported from u32 to link mode")
Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1a970d0

drivers/net/phy/phy_device.c

+3 −3
Original line number Diff line number Diff line
@@ -56,19 +56,19 @@ EXPORT_SYMBOL_GPL(phy_10gbit_features); 
__ETHTOOL_DECLARE_LINK_MODE_MASK(phy_10gbit_fec_features) __ro_after_init;

EXPORT_SYMBOL_GPL(phy_10gbit_fec_features);



static const int phy_basic_ports_array[] = {

const int phy_basic_ports_array[3] = {

	ETHTOOL_LINK_MODE_Autoneg_BIT,

	ETHTOOL_LINK_MODE_TP_BIT,

	ETHTOOL_LINK_MODE_MII_BIT,

};

EXPORT_SYMBOL_GPL(phy_basic_ports_array);



static const int phy_fibre_port_array[] = {

const int phy_fibre_port_array[1] = {

	ETHTOOL_LINK_MODE_FIBRE_BIT,

};

EXPORT_SYMBOL_GPL(phy_fibre_port_array);



static const int phy_all_ports_features_array[] = {

const int phy_all_ports_features_array[7] = {

	ETHTOOL_LINK_MODE_Autoneg_BIT,

	ETHTOOL_LINK_MODE_TP_BIT,

	ETHTOOL_LINK_MODE_MII_BIT,

include/linux/phy.h

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_10gbit_full_features) __ro_after_ini 
#define PHY_10GBIT_FEC_FEATURES ((unsigned long *)&phy_10gbit_fec_features)

#define PHY_10GBIT_FULL_FEATURES ((unsigned long *)&phy_10gbit_full_features)



extern const int phy_basic_ports_array[3];

extern const int phy_fibre_port_array[1];

extern const int phy_all_ports_features_array[7];

extern const int phy_10_100_features_array[4];

extern const int phy_basic_t1_features_array[2];

extern const int phy_gbit_features_array[2];