Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ethtool: factorize ethtool_get_strings() and ethtool_get_sset_count()

Browse source 
This is needed for unified offloads patch.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michał Mirosław 2011-02-15 16:59:16 +00:00 • committed by David S. Miller
parent 212b573f55
commit 340ae1654c
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
net/core/ethtool.c
View file

@ -172,6 +172,25 @@ EXPORT_SYMBOL(ethtool_ntuple_flush);
/* Handlers for each ethtool command */ /* Handlers for each ethtool command */
static int __ethtool_get_sset_count(struct net_device *dev, int sset)
{
const struct ethtool_ops *ops = dev->ethtool_ops;
if (ops && ops->get_sset_count && ops->get_strings)
return ops->get_sset_count(dev, sset);
else
return -EOPNOTSUPP;
}
static void __ethtool_get_strings(struct net_device *dev,
u32 stringset, u8 *data)
{
const struct ethtool_ops *ops = dev->ethtool_ops;
/* ops->get_strings is valid because checked earlier */
ops->get_strings(dev, stringset, data);
}
static int ethtool_get_settings(struct net_device *dev, void __user *useraddr) static int ethtool_get_settings(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET }; struct ethtool_cmd cmd = { .cmd = ETHTOOL_GSET };
@ -252,14 +271,10 @@ static noinline_for_stack int ethtool_get_sset_info(struct net_device *dev,
void __user *useraddr) void __user *useraddr)
{ {
struct ethtool_sset_info info; struct ethtool_sset_info info;
const struct ethtool_ops *ops = dev->ethtool_ops;
u64 sset_mask; u64 sset_mask;
int i, idx = 0, n_bits = 0, ret, rc; int i, idx = 0, n_bits = 0, ret, rc;
u32 *info_buf = NULL; u32 *info_buf = NULL;
if (!ops->get_sset_count)
return -EOPNOTSUPP;
if (copy_from_user(&info, useraddr, sizeof(info))) if (copy_from_user(&info, useraddr, sizeof(info)))
return -EFAULT; return -EFAULT;
@ -286,7 +301,7 @@ static noinline_for_stack int ethtool_get_sset_info(struct net_device *dev,
if (!(sset_mask & (1ULL << i))) if (!(sset_mask & (1ULL << i)))
continue; continue;
rc = ops->get_sset_count(dev, i); rc = __ethtool_get_sset_count(dev, i);
if (rc >= 0) { if (rc >= 0) {
info.sset_mask |= (1ULL << i); info.sset_mask |= (1ULL << i);
info_buf[idx++] = rc; info_buf[idx++] = rc;
@ -1287,17 +1302,13 @@ static int ethtool_self_test(struct net_device *dev, char __user *useraddr)
static int ethtool_get_strings(struct net_device *dev, void __user *useraddr) static int ethtool_get_strings(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_gstrings gstrings; struct ethtool_gstrings gstrings;
const struct ethtool_ops *ops = dev->ethtool_ops;
u8 *data; u8 *data;
int ret; int ret;
if (!ops->get_strings || !ops->get_sset_count)
return -EOPNOTSUPP;
if (copy_from_user(&gstrings, useraddr, sizeof(gstrings))) if (copy_from_user(&gstrings, useraddr, sizeof(gstrings)))
return -EFAULT; return -EFAULT;
ret = ops->get_sset_count(dev, gstrings.string_set); ret = __ethtool_get_sset_count(dev, gstrings.string_set);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1307,7 +1318,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr)
if (!data) if (!data)
return -ENOMEM; return -ENOMEM;
ops->get_strings(dev, gstrings.string_set, data); __ethtool_get_strings(dev, gstrings.string_set, data);
ret = -EFAULT; ret = -EFAULT;
if (copy_to_user(useraddr, &gstrings, sizeof(gstrings))) if (copy_to_user(useraddr, &gstrings, sizeof(gstrings)))
@ -1317,7 +1328,7 @@ static int ethtool_get_strings(struct net_device *dev, void __user *useraddr)
goto out; goto out;
ret = 0; ret = 0;
out: out:
kfree(data); kfree(data);
return ret; return ret;
} }