You need to sign in or sign up before continuing.
提交 7580fbdc 编写于 作者: H Hao Chen 提交者: Zheng Zengkai

net: hns3: remove unnecessary line wrap for hns3_set_tunable

mainline inclusion
from mainline-origin
commit 29c17cb6
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I56XHY
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=29c17cb67271

----------------------------------------------------------------------

Remove unnecessary line wrap for hns3_set_tunable to improve
function readability.
Signed-off-by: NHao Chen <chenhao288@hisilicon.com>
Signed-off-by: NGuangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NJiantao Xiao <xiaojiantao1@h-partners.com>
Reviewed-by: NYue Haibing <yuehaibing@huawei.com>
Reviewed-by: NJian Shen <shenjian15@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 82ab64b5
...@@ -1189,8 +1189,7 @@ static int hns3_set_ringparam(struct net_device *ndev, ...@@ -1189,8 +1189,7 @@ static int hns3_set_ringparam(struct net_device *ndev,
tmp_rings = hns3_backup_ringparam(priv); tmp_rings = hns3_backup_ringparam(priv);
if (!tmp_rings) { if (!tmp_rings) {
netdev_err(ndev, netdev_err(ndev, "backup ring param failed by allocating memory fail\n");
"backup ring param failed by allocating memory fail\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -1892,13 +1891,11 @@ static int hns3_set_tunable(struct net_device *netdev, ...@@ -1892,13 +1891,11 @@ static int hns3_set_tunable(struct net_device *netdev,
(!priv->ring->tx_spare && new_tx_spare_buf_size != 0)) { (!priv->ring->tx_spare && new_tx_spare_buf_size != 0)) {
int ret1; int ret1;
netdev_warn(netdev, netdev_warn(netdev, "change tx spare buf size fail, revert to old value\n");
"change tx spare buf size fail, revert to old value\n");
ret1 = hns3_set_tx_spare_buf_size(netdev, ret1 = hns3_set_tx_spare_buf_size(netdev,
old_tx_spare_buf_size); old_tx_spare_buf_size);
if (ret1) { if (ret1) {
netdev_err(netdev, netdev_err(netdev, "revert to old tx spare buf size fail\n");
"revert to old tx spare buf size fail\n");
return ret1; return ret1;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册