forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ethtool: Disallow ETHTOOL_SRSSH with both indir table and hash key unchanged

Browse source 
This would be a no-op, so there is no reason to request it.

This also allows conversion of the current implementations of
ethtool_ops::{get,set}_rxfh_indir to ethtool_ops::{get,set}_rxfh
with no change other than their parameters.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
This commit is contained in:
Ben Hutchings 2014-05-19 01:29:42 +01:00
commit 61d88c6811
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/ethtool.h
View file

@ -168,8 +168,8 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)
* @set_rxfh_indir: Set the contents of the RX flow hash indirection table.
* Will not be called if @get_rxfh_indir_size returns zero.
* @set_rxfh: Set the contents of the RX flow hash indirection table and/or
* hash key. Either or both arguments may be %NULL if that attribute
* is not to be changed.
* hash key. In case only the indirection table or hash key is to be
* changed, the other argument will be %NULL.
* Will only be called if one or both of @get_rxfh_indir_size and
* @get_rxfh_key_size are implemented and return non-zero.
* Returns a negative error code or zero.

5
net/core/ethtool.c
View file

@ -802,11 +802,14 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
return -EFAULT;
/* If either indir or hash key is valid, proceed further.
* It is not valid to request that both be unchanged.
*/
if ((user_indir_size &&
user_indir_size != ETH_RXFH_INDIR_NO_CHANGE &&
user_indir_size != dev_indir_size) ||
(user_key_size && (user_key_size != dev_key_size)))
(user_key_size && (user_key_size != dev_key_size)) ||
(user_indir_size == ETH_RXFH_INDIR_NO_CHANGE &&
user_key_size == 0))
return -EINVAL;
if (user_indir_size != ETH_RXFH_INDIR_NO_CHANGE)