UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: pasemi: fix error return code in pasemi_mac_open() 

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 72b05b9940 ("pasemi_mac: RX/TX ring management cleanup")
Fixes: 8d636d8bc5 ("pasemi_mac: jumbo frame support")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
Link: https://lore.kernel.org/r/1606903035-1838-1-git-send-email-zhangchangzhong@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Zhang Changzhong 2020-12-02 17:57:15 +08:00 committed by Jakub Kicinski
parent ff9924897f
commit aba84871bd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/pasemi/pasemi_mac.c
View File

@ -1078,16 +1078,20 @@ static int pasemi_mac_open(struct net_device *dev)
mac->tx = pasemi_mac_setup_tx_resources(dev); mac->tx = pasemi_mac_setup_tx_resources(dev);
if (!mac->tx) if (!mac->tx) {
ret = -ENOMEM;
goto out_tx_ring; goto out_tx_ring;
}
/* We might already have allocated rings in case mtu was changed /* We might already have allocated rings in case mtu was changed
* before interface was brought up. * before interface was brought up.
*/ */
if (dev->mtu > 1500 && !mac->num_cs) { if (dev->mtu > 1500 && !mac->num_cs) {
pasemi_mac_setup_csrings(mac); pasemi_mac_setup_csrings(mac);
if (!mac->num_cs) if (!mac->num_cs) {
ret = -ENOMEM;
goto out_tx_ring; goto out_tx_ring;
}
} }
/* Zero out rmon counters */ /* Zero out rmon counters */