aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sun
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2011-09-06 09:49:12 -0400
committerDavid S. Miller <davem@davemloft.net>2011-09-16 19:25:10 -0400
commit815c7db5c809ea3d5735de3131ecdf758b0e14ff (patch)
tree310304287c1671468cdd7ab006eeab4a725a4dda /drivers/net/ethernet/sun
parent434495c50ea786b89eca7f7af2bac424658a76ee (diff)
ethtool: Clean up definitions of rule location arrays in RX NFC
Correct the description of ethtool_rxnfc::rule_locs; it is an array of currently used locations, not all possible valid locations. Add note that drivers must not use ethtool_rxnfc::rule_locs. The rule_locs argument to ethtool_ops::get_rxnfc is either NULL or a pointer to an array of u32, so change the parameter type accordingly. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sun')
-rw-r--r--drivers/net/ethernet/sun/niu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c
index cad58f26c47..5e1e1d2748a 100644
--- a/drivers/net/ethernet/sun/niu.c
+++ b/drivers/net/ethernet/sun/niu.c
@@ -7303,7 +7303,7 @@ static int niu_get_ethtool_tcam_all(struct niu *np,
7303} 7303}
7304 7304
7305static int niu_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd, 7305static int niu_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
7306 void *rule_locs) 7306 u32 *rule_locs)
7307{ 7307{
7308 struct niu *np = netdev_priv(dev); 7308 struct niu *np = netdev_priv(dev);
7309 int ret = 0; 7309 int ret = 0;
@@ -7322,7 +7322,7 @@ static int niu_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd,
7322 ret = niu_get_ethtool_tcam_entry(np, cmd); 7322 ret = niu_get_ethtool_tcam_entry(np, cmd);
7323 break; 7323 break;
7324 case ETHTOOL_GRXCLSRLALL: 7324 case ETHTOOL_GRXCLSRLALL:
7325 ret = niu_get_ethtool_tcam_all(np, cmd, (u32 *)rule_locs); 7325 ret = niu_get_ethtool_tcam_all(np, cmd, rule_locs);
7326 break; 7326 break;
7327 default: 7327 default:
7328 ret = -EINVAL; 7328 ret = -EINVAL;