Commit 6e275143 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethtool-kdoc-touchups' 



Jakub Kicinski says:

====================
ethtool: fec: ioctl kdoc touch ups

A few touch ups from v1 review.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f59798b8 d04feeca

include/uapi/linux/ethtool.h

+14 −10
Original line number Diff line number Diff line
@@ -1382,6 +1382,10 @@ struct ethtool_per_queue_op { 
 * @fec: Bitmask of configured FEC modes.

 * @reserved: Reserved for future extensions, ignore on GET, write 0 for SET.

 *

 * Note that @reserved was never validated on input and ethtool user space

 * left it uninitialized when calling SET. Hence going forward it can only be

 * used to return a value to userspace with GET.

 *

 * FEC modes supported by the device can be read via %ETHTOOL_GLINKSETTINGS.

 * FEC settings are configured by link autonegotiation whenever it's enabled.

 * With autoneg on %ETHTOOL_GFECPARAM can be used to read the current mode.
@@ -1410,15 +1414,15 @@ struct ethtool_fecparam { 


/**

 * enum ethtool_fec_config_bits - flags definition of ethtool_fec_configuration

 * @ETHTOOL_FEC_NONE: FEC mode configuration is not supported. Should not

 * @ETHTOOL_FEC_NONE_BIT: FEC mode configuration is not supported. Should not

 *			be used together with other bits. GET only.

 * @ETHTOOL_FEC_AUTO: Select default/best FEC mode automatically, usually based

 *		      link mode and SFP parameters read from module's EEPROM.

 *		      This bit does _not_ mean autonegotiation.

 * @ETHTOOL_FEC_OFF: No FEC Mode

 * @ETHTOOL_FEC_RS: Reed-Solomon FEC Mode

 * @ETHTOOL_FEC_BASER: Base-R/Reed-Solomon FEC Mode

 * @ETHTOOL_FEC_LLRS: Low Latency Reed Solomon FEC Mode (25G/50G Ethernet

 * @ETHTOOL_FEC_AUTO_BIT: Select default/best FEC mode automatically, usually

 *			based link mode and SFP parameters read from module's

 *			EEPROM. This bit does _not_ mean autonegotiation.

 * @ETHTOOL_FEC_OFF_BIT: No FEC Mode

 * @ETHTOOL_FEC_RS_BIT: Reed-Solomon FEC Mode

 * @ETHTOOL_FEC_BASER_BIT: Base-R/Reed-Solomon FEC Mode

 * @ETHTOOL_FEC_LLRS_BIT: Low Latency Reed Solomon FEC Mode (25G/50G Ethernet

 *			Consortium)

 */

enum ethtool_fec_config_bits {

net/ethtool/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -2586,7 +2586,7 @@ static int ethtool_set_fecparam(struct net_device *dev, void __user *useraddr) 
	if (copy_from_user(&fecparam, useraddr, sizeof(fecparam)))

		return -EFAULT;



	if (!fecparam.fec || fecparam.fec & ETHTOOL_FEC_NONE_BIT)

	if (!fecparam.fec || fecparam.fec & ETHTOOL_FEC_NONE)

		return -EINVAL;



	fecparam.active_fec = 0;