aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex/benet/be_cmds.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-03 02:07:02 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-03 02:07:02 -0400
commit014b20133bcd442db554c2d2d86181b34cd15b66 (patch)
tree3402034d4bba5628d21c98258634c58d5bb46bb7 /drivers/net/ethernet/emulex/benet/be_cmds.c
parenta68ab98e6c7ab0955babcdc45ca446886f3bfb25 (diff)
parentf062a3844845d267e3716cbc188ad502a15898b7 (diff)
Merge branch 'ethtool-rssh-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/net-next
Ben Hutchings says: ==================== Pull request: Fixes for new ethtool RSS commands This addresses several problems I previously identified with the new ETHTOOL_{G,S}RSSH commands: 1. Missing validation of reserved parameters 2. Vague documentation 3. Use of unnamed magic number 4. No consolidation with existing driver operations I don't currently have access to suitable network hardware, but have tested these changes with a dummy driver that can support various combinations of operations and sizes, together with (a) Debian's ethtool 3.13 (b) ethtool 3.14 with the submitted patch to use ETHTOOL_{G,S}RSSH and minor adjustment for fixes 1 and 3. v2: Update RSS operations in vmxnet3 too ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_cmds.c')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index a568f7d1a24c..f4ea3490f446 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -2065,7 +2065,7 @@ int be_cmd_reset_function(struct be_adapter *adapter)
2065} 2065}
2066 2066
2067int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, 2067int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable,
2068 u32 rss_hash_opts, u16 table_size, u8 *rss_hkey) 2068 u32 rss_hash_opts, u16 table_size, const u8 *rss_hkey)
2069{ 2069{
2070 struct be_mcc_wrb *wrb; 2070 struct be_mcc_wrb *wrb;
2071 struct be_cmd_req_rss_config *req; 2071 struct be_cmd_req_rss_config *req;