git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/sfc/base: regenerate headers to pick up CTPIO stats
[dpdk.git]
/
drivers
/
net
/
sfc
/
base
/
ef10_tx.c
diff --git
a/drivers/net/sfc/base/ef10_tx.c
b/drivers/net/sfc/base/ef10_tx.c
index
3087306
..
8ca0b55
100644
(file)
--- a/
drivers/net/sfc/base/ef10_tx.c
+++ b/
drivers/net/sfc/base/ef10_tx.c
@@
-42,10
+42,15
@@
efx_mcdi_init_txq(
EFSYS_ASSERT(EFX_TXQ_MAX_BUFS >=
EFX_TXQ_NBUFS(enp->en_nic_cfg.enc_txq_max_ndescs));
EFSYS_ASSERT(EFX_TXQ_MAX_BUFS >=
EFX_TXQ_NBUFS(enp->en_nic_cfg.enc_txq_max_ndescs));
+ if ((esmp == NULL) || (EFSYS_MEM_SIZE(esmp) < EFX_TXQ_SIZE(ndescs))) {
+ rc = EINVAL;
+ goto fail1;
+ }
+
npages = EFX_TXQ_NBUFS(ndescs);
if (MC_CMD_INIT_TXQ_IN_LEN(npages) > sizeof (payload)) {
rc = EINVAL;
npages = EFX_TXQ_NBUFS(ndescs);
if (MC_CMD_INIT_TXQ_IN_LEN(npages) > sizeof (payload)) {
rc = EINVAL;
- goto fail
1
;
+ goto fail
2
;
}
(void) memset(payload, 0, sizeof (payload));
}
(void) memset(payload, 0, sizeof (payload));
@@
-94,11
+99,13
@@
efx_mcdi_init_txq(
if (req.emr_rc != 0) {
rc = req.emr_rc;
if (req.emr_rc != 0) {
rc = req.emr_rc;
- goto fail
2
;
+ goto fail
3
;
}
return (0);
}
return (0);
+fail3:
+ EFSYS_PROBE(fail3);
fail2:
EFSYS_PROBE(fail2);
fail1:
fail2:
EFSYS_PROBE(fail2);
fail1: