|
 |
9f74d4 |
From ddee1c7836e993932971a8938d308656bc5a53e2 Mon Sep 17 00:00:00 2001
|
|
|
9f74d4 |
From: Zhang Changzhong <zhangchangzhong@huawei.com>
|
|
|
9f74d4 |
Date: Wed, 2 Dec 2020 17:57:15 +0800
|
|
|
9f74d4 |
Subject: [PATCH 09/14] net: pasemi: fix error return code in pasemi_mac_open()
|
|
|
9f74d4 |
Git-commit: aba84871bd4f52c4dfcf3ad5d4501a6c9d2de90e
|
|
|
9f74d4 |
Patch-mainline: v5.10-rc7
|
|
|
9f74d4 |
References: git-fixes
|
|
|
9f74d4 |
|
|
|
9f74d4 |
Fix to return a negative error code from the error handling
|
|
|
9f74d4 |
case instead of 0, as done elsewhere in this function.
|
|
|
9f74d4 |
|
|
|
9f74d4 |
Fixes: 72b05b9940f0 ("pasemi_mac: RX/TX ring management cleanup")
|
|
|
9f74d4 |
Fixes: 8d636d8bc5ff ("pasemi_mac: jumbo frame support")
|
|
|
9f74d4 |
Reported-by: Hulk Robot <hulkci@huawei.com>
|
|
|
9f74d4 |
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
|
|
|
9f74d4 |
Link: https://lore.kernel.org/r/1606903035-1838-1-git-send-email-zhangchangzhong@huawei.com
|
|
|
9f74d4 |
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
9f74d4 |
Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>
|
|
|
9f74d4 |
---
|
|
|
9f74d4 |
drivers/net/ethernet/pasemi/pasemi_mac.c | 8 ++++++--
|
|
|
9f74d4 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
9f74d4 |
|
|
|
9f74d4 |
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c
|
|
|
9f74d4 |
index be6660128b55..040a15a828b4 100644
|
|
|
9f74d4 |
--- a/drivers/net/ethernet/pasemi/pasemi_mac.c
|
|
|
9f74d4 |
+++ b/drivers/net/ethernet/pasemi/pasemi_mac.c
|
|
|
9f74d4 |
@@ -1078,16 +1078,20 @@ static int pasemi_mac_open(struct net_device *dev)
|
|
|
9f74d4 |
|
|
|
9f74d4 |
mac->tx = pasemi_mac_setup_tx_resources(dev);
|
|
|
9f74d4 |
|
|
|
9f74d4 |
- if (!mac->tx)
|
|
|
9f74d4 |
+ if (!mac->tx) {
|
|
|
9f74d4 |
+ ret = -ENOMEM;
|
|
|
9f74d4 |
goto out_tx_ring;
|
|
|
9f74d4 |
+ }
|
|
|
9f74d4 |
|
|
|
9f74d4 |
/* We might already have allocated rings in case mtu was changed
|
|
|
9f74d4 |
* before interface was brought up.
|
|
|
9f74d4 |
*/
|
|
|
9f74d4 |
if (dev->mtu > 1500 && !mac->num_cs) {
|
|
|
9f74d4 |
pasemi_mac_setup_csrings(mac);
|
|
|
9f74d4 |
- if (!mac->num_cs)
|
|
|
9f74d4 |
+ if (!mac->num_cs) {
|
|
|
9f74d4 |
+ ret = -ENOMEM;
|
|
|
9f74d4 |
goto out_tx_ring;
|
|
|
9f74d4 |
+ }
|
|
|
9f74d4 |
}
|
|
|
9f74d4 |
|
|
|
9f74d4 |
/* Zero out rmon counters */
|
|
|
9f74d4 |
--
|
|
|
9f74d4 |
2.16.4
|
|
|
9f74d4 |
|