diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-11-08 14:50:17 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-11-08 14:50:22 +0000 |
| commit | b30bf840574a70b892bebc6e5281cd614cfc82c5 (patch) | |
| tree | af9a3331209ba3eb575e2de2a41da99a9dd40954 /drivers/net/cxgbe/base/t4_hw.c | |
| parent | 01dc13012315b1f147ccce80aed68050c9e31c2d (diff) | |
| parent | 055c52583a2794da8ba1e85a48cce3832372b12f (diff) | |
Merge branch 'upstream' into 17.11.x
Change-Id: I9f728c5947bfb5ba81f00306b7997685463ca13e
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/cxgbe/base/t4_hw.c')
| -rw-r--r-- | drivers/net/cxgbe/base/t4_hw.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/cxgbe/base/t4_hw.c b/drivers/net/cxgbe/base/t4_hw.c index a8ccea00..282e2e62 100644 --- a/drivers/net/cxgbe/base/t4_hw.c +++ b/drivers/net/cxgbe/base/t4_hw.c @@ -40,7 +40,6 @@ #include <rte_atomic.h> #include <rte_branch_prediction.h> #include <rte_memory.h> -#include <rte_memzone.h> #include <rte_tailq.h> #include <rte_eal.h> #include <rte_alarm.h> @@ -403,6 +402,7 @@ int t4_wr_mbox_meat_timeout(struct adapter *adap, int mbox, t4_os_atomic_list_del(&entry, &adap->mbox_list, &adap->mbox_lock); t4_report_fw_error(adap); + free(temp); return (pcie_fw & F_PCIE_FW_ERR) ? -ENXIO : -EBUSY; } @@ -446,6 +446,7 @@ int t4_wr_mbox_meat_timeout(struct adapter *adap, int mbox, &adap->mbox_list, &adap->mbox_lock)); t4_report_fw_error(adap); + free(temp); return (v == X_MBOWNER_FW ? -EBUSY : -ETIMEDOUT); } @@ -546,6 +547,7 @@ int t4_wr_mbox_meat_timeout(struct adapter *adap, int mbox, T4_OS_MBOX_LOCKING( t4_os_atomic_list_del(&entry, &adap->mbox_list, &adap->mbox_lock)); + free(temp); return -G_FW_CMD_RETVAL((int)res); } } |