aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vmxnet3
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2014-05-14 20:25:27 -0400
committerBen Hutchings <ben@decadent.org.uk>2014-06-02 21:42:44 -0400
commitfe62d001372388abb15a324148c913f9b43722a8 (patch)
tree28b1c01e537430432ee340ae8b6ad20c50429701 /drivers/net/vmxnet3
parent33cb0fa7888510b5bd2096352b200cfe29db10fe (diff)
ethtool: Replace ethtool_ops::{get,set}_rxfh_indir() with {get,set}_rxfh()
ETHTOOL_{G,S}RXFHINDIR and ETHTOOL_{G,S}RSSH should work for drivers regardless of whether they expose the hash key, unless you try to set a hash key for a driver that doesn't expose it. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/vmxnet3')
-rw-r--r--drivers/net/vmxnet3/vmxnet3_ethtool.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 00e120296e92..9396cca93b09 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -579,7 +579,7 @@ vmxnet3_get_rss_indir_size(struct net_device *netdev)
579} 579}
580 580
581static int 581static int
582vmxnet3_get_rss_indir(struct net_device *netdev, u32 *p) 582vmxnet3_get_rss(struct net_device *netdev, u32 *p, u8 *key)
583{ 583{
584 struct vmxnet3_adapter *adapter = netdev_priv(netdev); 584 struct vmxnet3_adapter *adapter = netdev_priv(netdev);
585 struct UPT1_RSSConf *rssConf = adapter->rss_conf; 585 struct UPT1_RSSConf *rssConf = adapter->rss_conf;
@@ -592,7 +592,7 @@ vmxnet3_get_rss_indir(struct net_device *netdev, u32 *p)
592} 592}
593 593
594static int 594static int
595vmxnet3_set_rss_indir(struct net_device *netdev, const u32 *p) 595vmxnet3_set_rss(struct net_device *netdev, const u32 *p, const u8 *key)
596{ 596{
597 unsigned int i; 597 unsigned int i;
598 unsigned long flags; 598 unsigned long flags;
@@ -628,8 +628,8 @@ static const struct ethtool_ops vmxnet3_ethtool_ops = {
628 .get_rxnfc = vmxnet3_get_rxnfc, 628 .get_rxnfc = vmxnet3_get_rxnfc,
629#ifdef VMXNET3_RSS 629#ifdef VMXNET3_RSS
630 .get_rxfh_indir_size = vmxnet3_get_rss_indir_size, 630 .get_rxfh_indir_size = vmxnet3_get_rss_indir_size,
631 .get_rxfh_indir = vmxnet3_get_rss_indir, 631 .get_rxfh = vmxnet3_get_rss,
632 .set_rxfh_indir = vmxnet3_set_rss_indir, 632 .set_rxfh = vmxnet3_set_rss,
633#endif 633#endif
634}; 634};
635 635