Commit 7888fe53 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ethtool: Add common function for filling out strings 



Add a function to handle the common pattern of printing a string into the
ethtool strings interface and incrementing the string pointer by the
ETH_GSTRING_LEN. Most of the drivers end up doing this and several have
implemented their own versions of this function so it would make sense to
consolidate on one implementation.

Signed-off-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c88eda9

include/linux/ethtool.h

+9 −0
Original line number Diff line number Diff line
@@ -571,4 +571,13 @@ struct ethtool_phy_ops { 
 */

void ethtool_set_ethtool_phy_ops(const struct ethtool_phy_ops *ops);



/**

 * ethtool_sprintf - Write formatted string to ethtool string data

 * @data: Pointer to start of string to update

 * @fmt: Format of string to write

 *

 * Write formatted string to data. Update data to point at start of

 * next string.

 */

extern __printf(2, 3) void ethtool_sprintf(u8 **data, const char *fmt, ...);

#endif /* _LINUX_ETHTOOL_H */

net/ethtool/ioctl.c

+12 −0
Original line number Diff line number Diff line
@@ -1844,6 +1844,18 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr) 
	return ret;

}



__printf(2, 3) void ethtool_sprintf(u8 **data, const char *fmt, ...)

{

	va_list args;



	va_start(args, fmt);

	vsnprintf(*data, ETH_GSTRING_LEN, fmt, args);

	va_end(args);



	*data += ETH_GSTRING_LEN;

}

EXPORT_SYMBOL(ethtool_sprintf);



static int ethtool_phys_id(struct net_device *dev, void __user *useraddr)

{

	struct ethtool_value id;