Commit beecfe9e authored by Kejian Yan's avatar Kejian Yan Committed by David S. Miller

net: hns: fix return value of the function about rss

Both .get_rxfh and .set_rxfh are always return 0, it should return result
from hardware when getting or setting rss. And the rss function should
return the correct data type.
Signed-off-by: default avatarKejian Yan <yankejian@huawei.com>
Signed-off-by: default avatarYisen Zhuang <Yisen.Zhuang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6f80563c
...@@ -803,7 +803,7 @@ static int hns_ae_set_rss(struct hnae_handle *handle, const u32 *indir, ...@@ -803,7 +803,7 @@ static int hns_ae_set_rss(struct hnae_handle *handle, const u32 *indir,
/* set the RSS Hash Key if specififed by the user */ /* set the RSS Hash Key if specififed by the user */
if (key) if (key)
hns_ppe_set_rss_key(ppe_cb, (int *)key); hns_ppe_set_rss_key(ppe_cb, (u32 *)key);
/* update the shadow RSS table with user specified qids */ /* update the shadow RSS table with user specified qids */
memcpy(ppe_cb->rss_indir_table, indir, HNS_PPEV2_RSS_IND_TBL_SIZE); memcpy(ppe_cb->rss_indir_table, indir, HNS_PPEV2_RSS_IND_TBL_SIZE);
......
...@@ -27,7 +27,7 @@ void hns_ppe_set_tso_enable(struct hns_ppe_cb *ppe_cb, u32 value) ...@@ -27,7 +27,7 @@ void hns_ppe_set_tso_enable(struct hns_ppe_cb *ppe_cb, u32 value)
void hns_ppe_set_rss_key(struct hns_ppe_cb *ppe_cb, void hns_ppe_set_rss_key(struct hns_ppe_cb *ppe_cb,
const u32 rss_key[HNS_PPEV2_RSS_KEY_NUM]) const u32 rss_key[HNS_PPEV2_RSS_KEY_NUM])
{ {
int key_item = 0; u32 key_item;
for (key_item = 0; key_item < HNS_PPEV2_RSS_KEY_NUM; key_item++) for (key_item = 0; key_item < HNS_PPEV2_RSS_KEY_NUM; key_item++)
dsaf_write_dev(ppe_cb, PPEV2_RSS_KEY_REG + key_item * 0x4, dsaf_write_dev(ppe_cb, PPEV2_RSS_KEY_REG + key_item * 0x4,
......
...@@ -1173,18 +1173,15 @@ hns_get_rss_key_size(struct net_device *netdev) ...@@ -1173,18 +1173,15 @@ hns_get_rss_key_size(struct net_device *netdev)
{ {
struct hns_nic_priv *priv = netdev_priv(netdev); struct hns_nic_priv *priv = netdev_priv(netdev);
struct hnae_ae_ops *ops; struct hnae_ae_ops *ops;
u32 ret;
if (AE_IS_VER1(priv->enet_ver)) { if (AE_IS_VER1(priv->enet_ver)) {
netdev_err(netdev, netdev_err(netdev,
"RSS feature is not supported on this hardware\n"); "RSS feature is not supported on this hardware\n");
return -EOPNOTSUPP; return 0;
} }
ops = priv->ae_handle->dev->ops; ops = priv->ae_handle->dev->ops;
ret = ops->get_rss_key_size(priv->ae_handle); return ops->get_rss_key_size(priv->ae_handle);
return ret;
} }
static u32 static u32
...@@ -1192,18 +1189,15 @@ hns_get_rss_indir_size(struct net_device *netdev) ...@@ -1192,18 +1189,15 @@ hns_get_rss_indir_size(struct net_device *netdev)
{ {
struct hns_nic_priv *priv = netdev_priv(netdev); struct hns_nic_priv *priv = netdev_priv(netdev);
struct hnae_ae_ops *ops; struct hnae_ae_ops *ops;
u32 ret;
if (AE_IS_VER1(priv->enet_ver)) { if (AE_IS_VER1(priv->enet_ver)) {
netdev_err(netdev, netdev_err(netdev,
"RSS feature is not supported on this hardware\n"); "RSS feature is not supported on this hardware\n");
return -EOPNOTSUPP; return 0;
} }
ops = priv->ae_handle->dev->ops; ops = priv->ae_handle->dev->ops;
ret = ops->get_rss_indir_size(priv->ae_handle); return ops->get_rss_indir_size(priv->ae_handle);
return ret;
} }
static int static int
...@@ -1211,7 +1205,6 @@ hns_get_rss(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc) ...@@ -1211,7 +1205,6 @@ hns_get_rss(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc)
{ {
struct hns_nic_priv *priv = netdev_priv(netdev); struct hns_nic_priv *priv = netdev_priv(netdev);
struct hnae_ae_ops *ops; struct hnae_ae_ops *ops;
int ret;
if (AE_IS_VER1(priv->enet_ver)) { if (AE_IS_VER1(priv->enet_ver)) {
netdev_err(netdev, netdev_err(netdev,
...@@ -1224,9 +1217,7 @@ hns_get_rss(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc) ...@@ -1224,9 +1217,7 @@ hns_get_rss(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc)
if (!indir) if (!indir)
return 0; return 0;
ret = ops->get_rss(priv->ae_handle, indir, key, hfunc); return ops->get_rss(priv->ae_handle, indir, key, hfunc);
return 0;
} }
static int static int
...@@ -1235,7 +1226,6 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key, ...@@ -1235,7 +1226,6 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key,
{ {
struct hns_nic_priv *priv = netdev_priv(netdev); struct hns_nic_priv *priv = netdev_priv(netdev);
struct hnae_ae_ops *ops; struct hnae_ae_ops *ops;
int ret;
if (AE_IS_VER1(priv->enet_ver)) { if (AE_IS_VER1(priv->enet_ver)) {
netdev_err(netdev, netdev_err(netdev,
...@@ -1252,9 +1242,7 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key, ...@@ -1252,9 +1242,7 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key,
if (!indir) if (!indir)
return 0; return 0;
ret = ops->set_rss(priv->ae_handle, indir, key, hfunc); return ops->set_rss(priv->ae_handle, indir, key, hfunc);
return 0;
} }
static struct ethtool_ops hns_ethtool_ops = { static struct ethtool_ops hns_ethtool_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment