Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 163
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 bc5787c6 编写于 作者: M Michał Mirosław 提交者： David S. Miller
浏览文件
操作

net: remove legacy ethtool ops 

As all drivers are converted, we may now remove discrete offload setting
callback handling.
Signed-off-by: NMichał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: NBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 33a5ba14
隐藏空白更改
内联 并排
Showing with 26 addition and 479 deletion
include/linux/ethtool.h
浏览文件 @ bc5787c6
...@@ -724,9 +724,6 @@ enum ethtool_sfeatures_retval_bits { ...@@ -724,9 +724,6 @@ enum ethtool_sfeatures_retval_bits {
#include <linux/rculist.h> #include <linux/rculist.h>
/* needed by dev_disable_lro() */
extern int __ethtool_set_flags(struct net_device *dev, u32 flags);
extern int __ethtool_get_settings(struct net_device *dev, extern int __ethtool_get_settings(struct net_device *dev,
struct ethtool_cmd *cmd); struct ethtool_cmd *cmd);
...@@ -750,19 +747,6 @@ struct net_device; ...@@ -750,19 +747,6 @@ struct net_device;
/* Some generic methods drivers may use in their ethtool_ops */ /* Some generic methods drivers may use in their ethtool_ops */
u32 ethtool_op_get_link(struct net_device *dev); u32 ethtool_op_get_link(struct net_device *dev);
u32 ethtool_op_get_tx_csum(struct net_device *dev);
int ethtool_op_set_tx_csum(struct net_device *dev, u32 data);
int ethtool_op_set_tx_hw_csum(struct net_device *dev, u32 data);
int ethtool_op_set_tx_ipv6_csum(struct net_device *dev, u32 data);
u32 ethtool_op_get_sg(struct net_device *dev);
int ethtool_op_set_sg(struct net_device *dev, u32 data);
u32 ethtool_op_get_tso(struct net_device *dev);
int ethtool_op_set_tso(struct net_device *dev, u32 data);
u32 ethtool_op_get_ufo(struct net_device *dev);
int ethtool_op_set_ufo(struct net_device *dev, u32 data);
u32 ethtool_op_get_flags(struct net_device *dev);
int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported);
bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported);
/** /**
* struct ethtool_ops - optional netdev operations * struct ethtool_ops - optional netdev operations
...@@ -807,22 +791,6 @@ bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported); ...@@ -807,22 +791,6 @@ bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported);
* @get_pauseparam: Report pause parameters * @get_pauseparam: Report pause parameters
* @set_pauseparam: Set pause parameters. Returns a negative error code * @set_pauseparam: Set pause parameters. Returns a negative error code
* or zero. * or zero.
* @get_rx_csum: Deprecated in favour of the netdev feature %NETIF_F_RXCSUM.
* Report whether receive checksums are turned on or off.
* @set_rx_csum: Deprecated in favour of generic netdev features. Turn
* receive checksum on or off. Returns a negative error code or zero.
* @get_tx_csum: Deprecated as redundant. Report whether transmit checksums
* are turned on or off.
* @set_tx_csum: Deprecated in favour of generic netdev features. Turn
* transmit checksums on or off. Returns a negative error code or zero.
* @get_sg: Deprecated as redundant. Report whether scatter-gather is
* enabled.
* @set_sg: Deprecated in favour of generic netdev features. Turn
* scatter-gather on or off. Returns a negative error code or zero.
* @get_tso: Deprecated as redundant. Report whether TCP segmentation
* offload is enabled.
* @set_tso: Deprecated in favour of generic netdev features. Turn TCP
* segmentation offload on or off. Returns a negative error code or zero.
* @self_test: Run specified self-tests * @self_test: Run specified self-tests
* @get_strings: Return a set of strings that describe the requested objects * @get_strings: Return a set of strings that describe the requested objects
* @set_phys_id: Identify the physical devices, e.g. by flashing an LED * @set_phys_id: Identify the physical devices, e.g. by flashing an LED
...@@ -844,15 +812,6 @@ bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported); ...@@ -844,15 +812,6 @@ bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported);
* negative error code or zero. * negative error code or zero.
* @complete: Function to be called after any other operation except * @complete: Function to be called after any other operation except
* @begin. Will be called even if the other operation failed. * @begin. Will be called even if the other operation failed.
* @get_ufo: Deprecated as redundant. Report whether UDP fragmentation
* offload is enabled.
* @set_ufo: Deprecated in favour of generic netdev features. Turn UDP
* fragmentation offload on or off. Returns a negative error code or zero.
* @get_flags: Deprecated as redundant. Report features included in
* &enum ethtool_flags that are enabled.
* @set_flags: Deprecated in favour of generic netdev features. Turn
* features included in &enum ethtool_flags on or off. Returns a
* negative error code or zero.
* @get_priv_flags: Report driver-specific feature flags. * @get_priv_flags: Report driver-specific feature flags.
* @set_priv_flags: Set driver-specific feature flags. Returns a negative * @set_priv_flags: Set driver-specific feature flags. Returns a negative
* error code or zero. * error code or zero.
...@@ -917,14 +876,6 @@ struct ethtool_ops { ...@@ -917,14 +876,6 @@ struct ethtool_ops {
struct ethtool_pauseparam*); struct ethtool_pauseparam*);
int (*set_pauseparam)(struct net_device *, int (*set_pauseparam)(struct net_device *,
struct ethtool_pauseparam*); struct ethtool_pauseparam*);
u32 (*get_rx_csum)(struct net_device *);
int (*set_rx_csum)(struct net_device *, u32);
u32 (*get_tx_csum)(struct net_device *);
int (*set_tx_csum)(struct net_device *, u32);
u32 (*get_sg)(struct net_device *);
int (*set_sg)(struct net_device *, u32);
u32 (*get_tso)(struct net_device *);
int (*set_tso)(struct net_device *, u32);
void (*self_test)(struct net_device *, struct ethtool_test *, u64 *); void (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
void (*get_strings)(struct net_device *, u32 stringset, u8 *); void (*get_strings)(struct net_device *, u32 stringset, u8 *);
int (*set_phys_id)(struct net_device *, enum ethtool_phys_id_state); int (*set_phys_id)(struct net_device *, enum ethtool_phys_id_state);
...@@ -932,10 +883,6 @@ struct ethtool_ops { ...@@ -932,10 +883,6 @@ struct ethtool_ops {
struct ethtool_stats *, u64 *); struct ethtool_stats *, u64 *);
int (*begin)(struct net_device *); int (*begin)(struct net_device *);
void (*complete)(struct net_device *); void (*complete)(struct net_device *);
u32 (*get_ufo)(struct net_device *);
int (*set_ufo)(struct net_device *, u32);
u32 (*get_flags)(struct net_device *);
int (*set_flags)(struct net_device *, u32);
u32 (*get_priv_flags)(struct net_device *); u32 (*get_priv_flags)(struct net_device *);
int (*set_priv_flags)(struct net_device *, u32); int (*set_priv_flags)(struct net_device *, u32);
int (*get_sset_count)(struct net_device *, int); int (*get_sset_count)(struct net_device *, int);
......
include/linux/netdevice.h
浏览文件 @ bc5787c6
...@@ -2592,22 +2592,6 @@ static inline int netif_is_bond_slave(struct net_device *dev) ...@@ -2592,22 +2592,6 @@ static inline int netif_is_bond_slave(struct net_device *dev)
extern struct pernet_operations __net_initdata loopback_net_ops; extern struct pernet_operations __net_initdata loopback_net_ops;
static inline u32 dev_ethtool_get_rx_csum(struct net_device *dev)
{
if (dev->features & NETIF_F_RXCSUM)
return 1;
if (!dev->ethtool_ops || !dev->ethtool_ops->get_rx_csum)
return 0;
return dev->ethtool_ops->get_rx_csum(dev);
}
static inline u32 dev_ethtool_get_flags(struct net_device *dev)
{
if (!dev->ethtool_ops || !dev->ethtool_ops->get_flags)
return 0;
return dev->ethtool_ops->get_flags(dev);
}
/* Logging, debugging and troubleshooting/diagnostic helpers. */ /* Logging, debugging and troubleshooting/diagnostic helpers. */
/* netdev_printk helpers, similar to dev_printk */ /* netdev_printk helpers, similar to dev_printk */
......
net/8021q/vlan_dev.c
浏览文件 @ bc5787c6
...@@ -596,13 +596,11 @@ static u32 vlan_dev_fix_features(struct net_device *dev, u32 features) ...@@ -596,13 +596,11 @@ static u32 vlan_dev_fix_features(struct net_device *dev, u32 features)
struct net_device *real_dev = vlan_dev_info(dev)->real_dev; struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
u32 old_features = features; u32 old_features = features;
features &= real_dev->features;
features &= real_dev->vlan_features; features &= real_dev->vlan_features;
features |= NETIF_F_RXCSUM;
features &= real_dev->features;
features |= old_features & NETIF_F_SOFT_FEATURES; features |= old_features & NETIF_F_SOFT_FEATURES;
if (dev_ethtool_get_rx_csum(real_dev))
features |= NETIF_F_RXCSUM;
features |= NETIF_F_LLTX; features |= NETIF_F_LLTX;
return features; return features;
......
net/core/dev.c
浏览文件 @ bc5787c6
...@@ -1321,8 +1321,6 @@ EXPORT_SYMBOL(dev_close); ...@@ -1321,8 +1321,6 @@ EXPORT_SYMBOL(dev_close);
*/ */
void dev_disable_lro(struct net_device *dev) void dev_disable_lro(struct net_device *dev)
{ {
u32 flags;
/* /*
* If we're trying to disable lro on a vlan device * If we're trying to disable lro on a vlan device
* use the underlying physical device instead * use the underlying physical device instead
...@@ -1330,15 +1328,9 @@ void dev_disable_lro(struct net_device *dev) ...@@ -1330,15 +1328,9 @@ void dev_disable_lro(struct net_device *dev)
if (is_vlan_dev(dev)) if (is_vlan_dev(dev))
dev = vlan_dev_real_dev(dev); dev = vlan_dev_real_dev(dev);
if (dev->ethtool_ops && dev->ethtool_ops->get_flags) dev->wanted_features &= ~NETIF_F_LRO;
flags = dev->ethtool_ops->get_flags(dev); netdev_update_features(dev);
else
flags = ethtool_op_get_flags(dev);
if (!(flags & ETH_FLAG_LRO))
return;
__ethtool_set_flags(dev, flags & ~ETH_FLAG_LRO);
if (unlikely(dev->features & NETIF_F_LRO)) if (unlikely(dev->features & NETIF_F_LRO))
netdev_WARN(dev, "failed to disable LRO!\n"); netdev_WARN(dev, "failed to disable LRO!\n");
} }
......
net/core/ethtool.c
浏览文件 @ bc5787c6
...@@ -36,236 +36,10 @@ u32 ethtool_op_get_link(struct net_device *dev) ...@@ -36,236 +36,10 @@ u32 ethtool_op_get_link(struct net_device *dev)
} }
EXPORT_SYMBOL(ethtool_op_get_link); EXPORT_SYMBOL(ethtool_op_get_link);
u32 ethtool_op_get_tx_csum(struct net_device *dev)
{
return (dev->features & NETIF_F_ALL_CSUM) != 0;
}
EXPORT_SYMBOL(ethtool_op_get_tx_csum);
int ethtool_op_set_tx_csum(struct net_device *dev, u32 data)
{
if (data)
dev->features |= NETIF_F_IP_CSUM;
else
dev->features &= ~NETIF_F_IP_CSUM;
return 0;
}
EXPORT_SYMBOL(ethtool_op_set_tx_csum);
int ethtool_op_set_tx_hw_csum(struct net_device *dev, u32 data)
{
if (data)
dev->features |= NETIF_F_HW_CSUM;
else
dev->features &= ~NETIF_F_HW_CSUM;
return 0;
}
EXPORT_SYMBOL(ethtool_op_set_tx_hw_csum);
int ethtool_op_set_tx_ipv6_csum(struct net_device *dev, u32 data)
{
if (data)
dev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM;
else
dev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
return 0;
}
EXPORT_SYMBOL(ethtool_op_set_tx_ipv6_csum);
u32 ethtool_op_get_sg(struct net_device *dev)
{
return (dev->features & NETIF_F_SG) != 0;
}
EXPORT_SYMBOL(ethtool_op_get_sg);
int ethtool_op_set_sg(struct net_device *dev, u32 data)
{
if (data)
dev->features |= NETIF_F_SG;
else
dev->features &= ~NETIF_F_SG;
return 0;
}
EXPORT_SYMBOL(ethtool_op_set_sg);
u32 ethtool_op_get_tso(struct net_device *dev)
{
return (dev->features & NETIF_F_TSO) != 0;
}
EXPORT_SYMBOL(ethtool_op_get_tso);
int ethtool_op_set_tso(struct net_device *dev, u32 data)
{
if (data)
dev->features |= NETIF_F_TSO;
else
dev->features &= ~NETIF_F_TSO;
return 0;
}
EXPORT_SYMBOL(ethtool_op_set_tso);
u32 ethtool_op_get_ufo(struct net_device *dev)
{
return (dev->features & NETIF_F_UFO) != 0;
}
EXPORT_SYMBOL(ethtool_op_get_ufo);
int ethtool_op_set_ufo(struct net_device *dev, u32 data)
{
if (data)
dev->features |= NETIF_F_UFO;
else
dev->features &= ~NETIF_F_UFO;
return 0;
}
EXPORT_SYMBOL(ethtool_op_set_ufo);
/* the following list of flags are the same as their associated
* NETIF_F_xxx values in include/linux/netdevice.h
*/
static const u32 flags_dup_features =
(ETH_FLAG_LRO | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN | ETH_FLAG_NTUPLE |
ETH_FLAG_RXHASH);
u32 ethtool_op_get_flags(struct net_device *dev)
{
/* in the future, this function will probably contain additional
* handling for flags which are not so easily handled
* by a simple masking operation
*/
return dev->features & flags_dup_features;
}
EXPORT_SYMBOL(ethtool_op_get_flags);
/* Check if device can enable (or disable) particular feature coded in "data"
* argument. Flags "supported" describe features that can be toggled by device.
* If feature can not be toggled, it state (enabled or disabled) must match
* hardcoded device features state, otherwise flags are marked as invalid.
*/
bool ethtool_invalid_flags(struct net_device *dev, u32 data, u32 supported)
{
u32 features = dev->features & flags_dup_features;
/* "data" can contain only flags_dup_features bits,
* see __ethtool_set_flags */
return (features & ~supported) != (data & ~supported);
}
EXPORT_SYMBOL(ethtool_invalid_flags);
int ethtool_op_set_flags(struct net_device *dev, u32 data, u32 supported)
{
if (ethtool_invalid_flags(dev, data, supported))
return -EINVAL;
dev->features = ((dev->features & ~flags_dup_features) |
(data & flags_dup_features));
return 0;
}
EXPORT_SYMBOL(ethtool_op_set_flags);
/* Handlers for each ethtool command */ /* Handlers for each ethtool command */
#define ETHTOOL_DEV_FEATURE_WORDS 1 #define ETHTOOL_DEV_FEATURE_WORDS 1
static void ethtool_get_features_compat(struct net_device *dev,
struct ethtool_get_features_block *features)
{
if (!dev->ethtool_ops)
return;
/* getting RX checksum */
if (dev->ethtool_ops->get_rx_csum)
if (dev->ethtool_ops->get_rx_csum(dev))
features[0].active |= NETIF_F_RXCSUM;
/* mark legacy-changeable features */
if (dev->ethtool_ops->set_sg)
features[0].available |= NETIF_F_SG;
if (dev->ethtool_ops->set_tx_csum)
features[0].available |= NETIF_F_ALL_CSUM;
if (dev->ethtool_ops->set_tso)
features[0].available |= NETIF_F_ALL_TSO;
if (dev->ethtool_ops->set_rx_csum)
features[0].available |= NETIF_F_RXCSUM;
if (dev->ethtool_ops->set_flags)
features[0].available |= flags_dup_features;
}
static int ethtool_set_feature_compat(struct net_device *dev,
int (*legacy_set)(struct net_device *, u32),
struct ethtool_set_features_block *features, u32 mask)
{
u32 do_set;
if (!legacy_set)
return 0;
if (!(features[0].valid & mask))
return 0;
features[0].valid &= ~mask;
do_set = !!(features[0].requested & mask);
if (legacy_set(dev, do_set) < 0)
netdev_info(dev,
"Legacy feature change (%s) failed for 0x%08x\n",
do_set ? "set" : "clear", mask);
return 1;
}
static int ethtool_set_flags_compat(struct net_device *dev,
int (*legacy_set)(struct net_device *, u32),
struct ethtool_set_features_block *features, u32 mask)
{
u32 value;
if (!legacy_set)
return 0;
if (!(features[0].valid & mask))
return 0;
value = dev->features & ~features[0].valid;
value |= features[0].requested;
features[0].valid &= ~mask;
if (legacy_set(dev, value & mask) < 0)
netdev_info(dev, "Legacy flags change failed\n");
return 1;
}
static int ethtool_set_features_compat(struct net_device *dev,
struct ethtool_set_features_block *features)
{
int compat;
if (!dev->ethtool_ops)
return 0;
compat = ethtool_set_feature_compat(dev, dev->ethtool_ops->set_sg,
features, NETIF_F_SG);
compat |= ethtool_set_feature_compat(dev, dev->ethtool_ops->set_tx_csum,
features, NETIF_F_ALL_CSUM);
compat |= ethtool_set_feature_compat(dev, dev->ethtool_ops->set_tso,
features, NETIF_F_ALL_TSO);
compat |= ethtool_set_feature_compat(dev, dev->ethtool_ops->set_rx_csum,
features, NETIF_F_RXCSUM);
compat |= ethtool_set_flags_compat(dev, dev->ethtool_ops->set_flags,
features, flags_dup_features);
return compat;
}
static int ethtool_get_features(struct net_device *dev, void __user *useraddr) static int ethtool_get_features(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_gfeatures cmd = { struct ethtool_gfeatures cmd = {
...@@ -283,8 +57,6 @@ static int ethtool_get_features(struct net_device *dev, void __user *useraddr) ...@@ -283,8 +57,6 @@ static int ethtool_get_features(struct net_device *dev, void __user *useraddr)
u32 __user *sizeaddr; u32 __user *sizeaddr;
u32 copy_size; u32 copy_size;
ethtool_get_features_compat(dev, features);
sizeaddr = useraddr + offsetof(struct ethtool_gfeatures, size); sizeaddr = useraddr + offsetof(struct ethtool_gfeatures, size);
if (get_user(copy_size, sizeaddr)) if (get_user(copy_size, sizeaddr))
return -EFAULT; return -EFAULT;
...@@ -320,9 +92,6 @@ static int ethtool_set_features(struct net_device *dev, void __user *useraddr) ...@@ -320,9 +92,6 @@ static int ethtool_set_features(struct net_device *dev, void __user *useraddr)
if (features[0].valid & ~NETIF_F_ETHTOOL_BITS) if (features[0].valid & ~NETIF_F_ETHTOOL_BITS)
return -EINVAL; return -EINVAL;
if (ethtool_set_features_compat(dev, features))
ret |= ETHTOOL_F_COMPAT;
if (features[0].valid & ~dev->hw_features) { if (features[0].valid & ~dev->hw_features) {
features[0].valid &= dev->hw_features; features[0].valid &= dev->hw_features;
ret |= ETHTOOL_F_UNSUPPORTED; ret |= ETHTOOL_F_UNSUPPORTED;
...@@ -433,34 +202,6 @@ static u32 ethtool_get_feature_mask(u32 eth_cmd) ...@@ -433,34 +202,6 @@ static u32 ethtool_get_feature_mask(u32 eth_cmd)
} }
} }
static void *__ethtool_get_one_feature_actor(struct net_device *dev, u32 ethcmd)
{
const struct ethtool_ops *ops = dev->ethtool_ops;
if (!ops)
return NULL;
switch (ethcmd) {
case ETHTOOL_GTXCSUM:
return ops->get_tx_csum;
case ETHTOOL_GRXCSUM:
return ops->get_rx_csum;
case ETHTOOL_SSG:
return ops->get_sg;
case ETHTOOL_STSO:
return ops->get_tso;
case ETHTOOL_SUFO:
return ops->get_ufo;
default:
return NULL;
}
}
static u32 __ethtool_get_rx_csum_oldbug(struct net_device *dev)
{
return !!(dev->features & NETIF_F_ALL_CSUM);
}
static int ethtool_get_one_feature(struct net_device *dev, static int ethtool_get_one_feature(struct net_device *dev,
char __user *useraddr, u32 ethcmd) char __user *useraddr, u32 ethcmd)
{ {
...@@ -470,31 +211,11 @@ static int ethtool_get_one_feature(struct net_device *dev, ...@@ -470,31 +211,11 @@ static int ethtool_get_one_feature(struct net_device *dev,
.data = !!(dev->features & mask), .data = !!(dev->features & mask),
}; };
/* compatibility with discrete get_ ops */
if (!(dev->hw_features & mask)) {
u32 (*actor)(struct net_device *);
actor = __ethtool_get_one_feature_actor(dev, ethcmd);
/* bug compatibility with old get_rx_csum */
if (ethcmd == ETHTOOL_GRXCSUM && !actor)
actor = __ethtool_get_rx_csum_oldbug;
if (actor)
edata.data = actor(dev);
}
if (copy_to_user(useraddr, &edata, sizeof(edata))) if (copy_to_user(useraddr, &edata, sizeof(edata)))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
static int __ethtool_set_tx_csum(struct net_device *dev, u32 data);
static int __ethtool_set_rx_csum(struct net_device *dev, u32 data);
static int __ethtool_set_sg(struct net_device *dev, u32 data);
static int __ethtool_set_tso(struct net_device *dev, u32 data);
static int __ethtool_set_ufo(struct net_device *dev, u32 data);
static int ethtool_set_one_feature(struct net_device *dev, static int ethtool_set_one_feature(struct net_device *dev,
void __user *useraddr, u32 ethcmd) void __user *useraddr, u32 ethcmd)
{ {
...@@ -506,56 +227,38 @@ static int ethtool_set_one_feature(struct net_device *dev, ...@@ -506,56 +227,38 @@ static int ethtool_set_one_feature(struct net_device *dev,
mask = ethtool_get_feature_mask(ethcmd); mask = ethtool_get_feature_mask(ethcmd);
mask &= dev->hw_features; mask &= dev->hw_features;
if (mask) { if (!mask)
if (edata.data) return -EOPNOTSUPP;
dev->wanted_features |= mask;
else
dev->wanted_features &= ~mask;
__netdev_update_features(dev); if (edata.data)
return 0; dev->wanted_features |= mask;
} else
dev->wanted_features &= ~mask;
/* Driver is not converted to ndo_fix_features or does not __netdev_update_features(dev);
* support changing this offload. In the latter case it won't
* have corresponding ethtool_ops field set.
*
* Following part is to be removed after all drivers advertise
* their changeable features in netdev->hw_features and stop
* using discrete offload setting ops.
*/
switch (ethcmd) { return 0;
case ETHTOOL_STXCSUM: }
return __ethtool_set_tx_csum(dev, edata.data);
case ETHTOOL_SRXCSUM: /* the following list of flags are the same as their associated
return __ethtool_set_rx_csum(dev, edata.data); * NETIF_F_xxx values in include/linux/netdevice.h
case ETHTOOL_SSG: */
return __ethtool_set_sg(dev, edata.data); static const u32 flags_dup_features =
case ETHTOOL_STSO: (ETH_FLAG_LRO | ETH_FLAG_RXVLAN | ETH_FLAG_TXVLAN | ETH_FLAG_NTUPLE |
return __ethtool_set_tso(dev, edata.data); ETH_FLAG_RXHASH);
case ETHTOOL_SUFO:
return __ethtool_set_ufo(dev, edata.data); static u32 __ethtool_get_flags(struct net_device *dev)
default: {
return -EOPNOTSUPP; return dev->features & flags_dup_features;
}
} }
int __ethtool_set_flags(struct net_device *dev, u32 data) static int __ethtool_set_flags(struct net_device *dev, u32 data)
{ {
u32 changed; u32 changed;
if (data & ~flags_dup_features) if (data & ~flags_dup_features)
return -EINVAL; return -EINVAL;
/* legacy set_flags() op */
if (dev->ethtool_ops->set_flags) {
if (unlikely(dev->hw_features & flags_dup_features))
netdev_warn(dev,
"driver BUG: mixed hw_features and set_flags()\n");
return dev->ethtool_ops->set_flags(dev, data);
}
/* allow changing only bits set in hw_features */ /* allow changing only bits set in hw_features */
changed = (data ^ dev->features) & flags_dup_features; changed = (data ^ dev->features) & flags_dup_features;
if (changed & ~dev->hw_features) if (changed & ~dev->hw_features)
...@@ -1231,81 +934,6 @@ static int ethtool_set_pauseparam(struct net_device *dev, void __user *useraddr) ...@@ -1231,81 +934,6 @@ static int ethtool_set_pauseparam(struct net_device *dev, void __user *useraddr)
return dev->ethtool_ops->set_pauseparam(dev, &pauseparam); return dev->ethtool_ops->set_pauseparam(dev, &pauseparam);
} }
static int __ethtool_set_sg(struct net_device *dev, u32 data)
{
int err;
if (!dev->ethtool_ops->set_sg)
return -EOPNOTSUPP;
if (data && !(dev->features & NETIF_F_ALL_CSUM))
return -EINVAL;
if (!data && dev->ethtool_ops->set_tso) {
err = dev->ethtool_ops->set_tso(dev, 0);
if (err)
return err;
}
if (!data && dev->ethtool_ops->set_ufo) {
err = dev->ethtool_ops->set_ufo(dev, 0);
if (err)
return err;
}
return dev->ethtool_ops->set_sg(dev, data);
}
static int __ethtool_set_tx_csum(struct net_device *dev, u32 data)
{
int err;
if (!dev->ethtool_ops->set_tx_csum)
return -EOPNOTSUPP;
if (!data && dev->ethtool_ops->set_sg) {
err = __ethtool_set_sg(dev, 0);
if (err)
return err;
}
return dev->ethtool_ops->set_tx_csum(dev, data);
}
static int __ethtool_set_rx_csum(struct net_device *dev, u32 data)
{
if (!dev->ethtool_ops->set_rx_csum)
return -EOPNOTSUPP;
if (!data)
dev->features &= ~NETIF_F_GRO;
return dev->ethtool_ops->set_rx_csum(dev, data);
}
static int __ethtool_set_tso(struct net_device *dev, u32 data)
{
if (!dev->ethtool_ops->set_tso)
return -EOPNOTSUPP;
if (data && !(dev->features & NETIF_F_SG))
return -EINVAL;
return dev->ethtool_ops->set_tso(dev, data);
}
static int __ethtool_set_ufo(struct net_device *dev, u32 data)
{
if (!dev->ethtool_ops->set_ufo)
return -EOPNOTSUPP;
if (data && !(dev->features & NETIF_F_SG))
return -EINVAL;
if (data && !((dev->features & NETIF_F_GEN_CSUM) ||
(dev->features & (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM))
== (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM)))
return -EINVAL;
return dev->ethtool_ops->set_ufo(dev, data);
}
static int ethtool_self_test(struct net_device *dev, char __user *useraddr) static int ethtool_self_test(struct net_device *dev, char __user *useraddr)
{ {
struct ethtool_test test; struct ethtool_test test;
...@@ -1771,9 +1399,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) ...@@ -1771,9 +1399,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
break; break;
case ETHTOOL_GFLAGS: case ETHTOOL_GFLAGS:
rc = ethtool_get_value(dev, useraddr, ethcmd, rc = ethtool_get_value(dev, useraddr, ethcmd,
(dev->ethtool_ops->get_flags ? __ethtool_get_flags);
dev->ethtool_ops->get_flags :
ethtool_op_get_flags));
break; break;
case ETHTOOL_SFLAGS: case ETHTOOL_SFLAGS:
rc = ethtool_set_value(dev, useraddr, __ethtool_set_flags); rc = ethtool_set_value(dev, useraddr, __ethtool_set_flags);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或