Commit 95dfc7ef authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: ethtool: Export helpers for getting EEPROM info 



There are two ways to retrieve information from SFP EEPROMs.  Many
devices make use of the common code, and assign the sfp_bus pointer in
the netdev to point to the bus holding the SFP device. Some MAC
drivers directly implement ops in there ethool structure.

Export within net/ethtool the two helpers used to call these methods,
so that they can also be used in the new netlink code.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c88fa41

net/ethtool/common.h

+5 −0
Original line number Diff line number Diff line
@@ -47,4 +47,9 @@ int __ethtool_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info); 


extern const struct ethtool_phy_ops *ethtool_phy_ops;



int ethtool_get_module_info_call(struct net_device *dev,

				 struct ethtool_modinfo *modinfo);

int ethtool_get_module_eeprom_call(struct net_device *dev,

				   struct ethtool_eeprom *ee, u8 *data);



#endif /* _ETHTOOL_COMMON_H */

net/ethtool/ioctl.c

+7 −7
Original line number Diff line number Diff line
@@ -2188,7 +2188,7 @@ static int ethtool_get_ts_info(struct net_device *dev, void __user *useraddr) 
	return 0;

}



static int __ethtool_get_module_info(struct net_device *dev,

int ethtool_get_module_info_call(struct net_device *dev,

				 struct ethtool_modinfo *modinfo)

{

	const struct ethtool_ops *ops = dev->ethtool_ops;
@@ -2215,7 +2215,7 @@ static int ethtool_get_module_info(struct net_device *dev, 
	if (copy_from_user(&modinfo, useraddr, sizeof(modinfo)))

		return -EFAULT;



	ret = __ethtool_get_module_info(dev, &modinfo);

	ret = ethtool_get_module_info_call(dev, &modinfo);

	if (ret)

		return ret;
@@ -2225,7 +2225,7 @@ static int ethtool_get_module_info(struct net_device *dev, 
	return 0;

}



static int __ethtool_get_module_eeprom(struct net_device *dev,

int ethtool_get_module_eeprom_call(struct net_device *dev,

				   struct ethtool_eeprom *ee, u8 *data)

{

	const struct ethtool_ops *ops = dev->ethtool_ops;
@@ -2249,12 +2249,12 @@ static int ethtool_get_module_eeprom(struct net_device *dev, 
	int ret;

	struct ethtool_modinfo modinfo;



	ret = __ethtool_get_module_info(dev, &modinfo);

	ret = ethtool_get_module_info_call(dev, &modinfo);

	if (ret)

		return ret;



	return ethtool_get_any_eeprom(dev, useraddr,

				      __ethtool_get_module_eeprom,

				      ethtool_get_module_eeprom_call,

				      modinfo.eeprom_len);

}