| Message ID | 1457576189-22924-2-git-send-email-yankejian@huawei.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, 2016-03-10 at 10:16 +0800, Kejian Yan wrote: > Both .get_rxfh and .get_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. > @@ -1213,7 +1213,7 @@ hns_get_rss(struct net_device *netdev, u32 > *indir, u8 *key, u8 *hfunc) > > > ret = ops->get_rss(priv->ae_handle, indir, key, hfunc); > > - return 0; > + return ret; All three can be one line. > @@ -1241,7 +1241,7 @@ hns_set_rss(struct net_device *netdev, const > u32 *indir, const u8 *key, > > ret = ops->set_rss(priv->ae_handle, indir, key, hfunc); > > - return 0; > + return ret; Ditto.
On 2016/3/10 16:11, Andy Shevchenko wrote: > On Thu, 2016-03-10 at 10:16 +0800, Kejian Yan wrote: >> Both .get_rxfh and .get_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. >> > @@ -1213,7 +1213,7 @@ hns_get_rss(struct net_device *netdev, u32 >> *indir, u8 *key, u8 *hfunc) >> >> >> ret = ops->get_rss(priv->ae_handle, indir, key, hfunc); >> >> - return 0; >> + return ret; > All three can be one line. ok, thanks! >> @@ -1241,7 +1241,7 @@ hns_set_rss(struct net_device *netdev, const >> u32 *indir, const u8 *key, >> >> ret = ops->set_rss(priv->ae_handle, indir, key, hfunc); >> >> - return 0; >> + return ret; > Ditto. > ok, thanks!
diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c index a0070d0..3b8f301 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c @@ -791,7 +791,7 @@ static int hns_ae_set_rss(struct hnae_handle *handle, const u32 *indir, /* set the RSS Hash Key if specififed by the user */ 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 */ memcpy(ppe_cb->rss_indir_table, indir, HNS_PPEV2_RSS_IND_TBL_SIZE); diff --git a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c index f302ef9..811ef35 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c @@ -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, const u32 rss_key[HNS_PPEV2_RSS_KEY_NUM]) { - int key_item = 0; + u32 key_item = 0; 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, diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c index 3df2284..ada8e04 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -1165,7 +1165,7 @@ hns_get_rss_key_size(struct net_device *netdev) if (AE_IS_VER1(priv->enet_ver)) { netdev_err(netdev, "RSS feature is not supported on this hardware\n"); - return -EOPNOTSUPP; + return (u32)-EOPNOTSUPP; } ops = priv->ae_handle->dev->ops; @@ -1184,7 +1184,7 @@ hns_get_rss_indir_size(struct net_device *netdev) if (AE_IS_VER1(priv->enet_ver)) { netdev_err(netdev, "RSS feature is not supported on this hardware\n"); - return -EOPNOTSUPP; + return (u32)-EOPNOTSUPP; } ops = priv->ae_handle->dev->ops; @@ -1213,7 +1213,7 @@ hns_get_rss(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc) ret = ops->get_rss(priv->ae_handle, indir, key, hfunc); - return 0; + return ret; } static int @@ -1241,7 +1241,7 @@ hns_set_rss(struct net_device *netdev, const u32 *indir, const u8 *key, ret = ops->set_rss(priv->ae_handle, indir, key, hfunc); - return 0; + return ret; } static struct ethtool_ops hns_ethtool_ops = {
Both .get_rxfh and .get_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: Kejian Yan <yankejian@huawei.com> --- drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-)