Commit 0d643e1f authored by Peter Waskiewicz's avatar Peter Waskiewicz Committed by David S. Miller
Browse files

ethtool: Move n-tuple capability check into set_flags

set_flags should check if the underlying device supports
n-tuple filter programming before setting the device flags
on the netdevice.
Signed-off-by: default avatarPeter P Waskiewicz Jr <>
Signed-off-by: default avatarJeff Kirsher <>
Signed-off-by: default avatarDavid S. Miller <>
parent e8589118
......@@ -134,15 +134,21 @@ u32 ethtool_op_get_flags(struct net_device *dev)
int ethtool_op_set_flags(struct net_device *dev, u32 data)
const struct ethtool_ops *ops = dev->ethtool_ops;
if (data & ETH_FLAG_LRO)
dev->features |= NETIF_F_LRO;
dev->features &= ~NETIF_F_LRO;
if (data & ETH_FLAG_NTUPLE)
if (data & ETH_FLAG_NTUPLE) {
if (!ops->set_rx_ntuple)
dev->features |= NETIF_F_NTUPLE;
} else {
/* safe to clear regardless */
dev->features &= ~NETIF_F_NTUPLE;
return 0;
......@@ -318,9 +324,6 @@ static int ethtool_set_rx_ntuple(struct net_device *dev, void __user *useraddr)
struct ethtool_rx_ntuple_flow_spec_container *fsc = NULL;
int ret;
if (!ops->set_rx_ntuple)
if (!(dev->features & NETIF_F_NTUPLE))
return -EINVAL;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment