aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.c2
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.h2
-rw-r--r--drivers/net/ethernet/emulex/benet/be_ethtool.c3
-rw-r--r--include/linux/ethtool.h3
4 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 476752d0a6a4..7b59da241ccb 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -2033,7 +2033,7 @@ int be_cmd_reset_function(struct be_adapter *adapter)
2033} 2033}
2034 2034
2035int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, 2035int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable,
2036 u32 rss_hash_opts, u16 table_size, u8 *rss_hkey) 2036 u32 rss_hash_opts, u16 table_size, const u8 *rss_hkey)
2037{ 2037{
2038 struct be_mcc_wrb *wrb; 2038 struct be_mcc_wrb *wrb;
2039 struct be_cmd_req_rss_config *req; 2039 struct be_cmd_req_rss_config *req;
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.h b/drivers/net/ethernet/emulex/benet/be_cmds.h
index 228d4b611084..451f3138b8fb 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.h
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.h
@@ -2068,7 +2068,7 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter, u32 *port_num,
2068 u32 *function_mode, u32 *function_caps, u16 *asic_rev); 2068 u32 *function_mode, u32 *function_caps, u16 *asic_rev);
2069int be_cmd_reset_function(struct be_adapter *adapter); 2069int be_cmd_reset_function(struct be_adapter *adapter);
2070int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable, 2070int be_cmd_rss_config(struct be_adapter *adapter, u8 *rsstable,
2071 u32 rss_hash_opts, u16 table_size, u8 *rss_hkey); 2071 u32 rss_hash_opts, u16 table_size, const u8 *rss_hkey);
2072int be_process_mcc(struct be_adapter *adapter); 2072int be_process_mcc(struct be_adapter *adapter);
2073int be_cmd_set_beacon_state(struct be_adapter *adapter, u8 port_num, u8 beacon, 2073int be_cmd_set_beacon_state(struct be_adapter *adapter, u8 port_num, u8 beacon,
2074 u8 status, u8 state); 2074 u8 status, u8 state);
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 970ae337daac..e2da4d20dd3d 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -1117,7 +1117,8 @@ static int be_get_rxfh(struct net_device *netdev, u32 *indir, u8 *hkey)
1117 return 0; 1117 return 0;
1118} 1118}
1119 1119
1120static int be_set_rxfh(struct net_device *netdev, u32 *indir, u8 *hkey) 1120static int be_set_rxfh(struct net_device *netdev, const u32 *indir,
1121 const u8 *hkey)
1121{ 1122{
1122 int rc = 0, i, j; 1123 int rc = 0, i, j;
1123 struct be_adapter *adapter = netdev_priv(netdev); 1124 struct be_adapter *adapter = netdev_priv(netdev);
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index de687a97c6e7..874fde01d398 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -246,7 +246,8 @@ struct ethtool_ops {
246 u32 (*get_rxfh_key_size)(struct net_device *); 246 u32 (*get_rxfh_key_size)(struct net_device *);
247 u32 (*get_rxfh_indir_size)(struct net_device *); 247 u32 (*get_rxfh_indir_size)(struct net_device *);
248 int (*get_rxfh)(struct net_device *, u32 *indir, u8 *key); 248 int (*get_rxfh)(struct net_device *, u32 *indir, u8 *key);
249 int (*set_rxfh)(struct net_device *, u32 *indir, u8 *key); 249 int (*set_rxfh)(struct net_device *, const u32 *indir,
250 const u8 *key);
250 int (*get_rxfh_indir)(struct net_device *, u32 *); 251 int (*get_rxfh_indir)(struct net_device *, u32 *);
251 int (*set_rxfh_indir)(struct net_device *, const u32 *); 252 int (*set_rxfh_indir)(struct net_device *, const u32 *);
252 void (*get_channels)(struct net_device *, struct ethtool_channels *); 253 void (*get_channels)(struct net_device *, struct ethtool_channels *);