d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix case of setting OACTIVE erroneously

Browse Source
This commit is contained in:
Kip Macy 2007-05-29 04:18:21 +00:00
parent 2ed1085b1d
commit cebf6b9f64
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/cxgb/cxgb_main.c
View File

@ -175,6 +175,7 @@ extern int collapse_mbufs;
* msi = 0: force pin interrupts * msi = 0: force pin interrupts
*/ */
static int msi_allowed = 2; static int msi_allowed = 2;
TUNABLE_INT("hw.cxgb.msi_allowed", &msi_allowed); TUNABLE_INT("hw.cxgb.msi_allowed", &msi_allowed);
SYSCTL_NODE(_hw, OID_AUTO, cxgb, CTLFLAG_RD, 0, "CXGB driver parameters"); SYSCTL_NODE(_hw, OID_AUTO, cxgb, CTLFLAG_RD, 0, "CXGB driver parameters");
SYSCTL_UINT(_hw_cxgb, OID_AUTO, msi_allowed, CTLFLAG_RDTUN, &msi_allowed, 0, SYSCTL_UINT(_hw_cxgb, OID_AUTO, msi_allowed, CTLFLAG_RDTUN, &msi_allowed, 0,
@ -1593,13 +1594,13 @@ cxgb_start_tx(struct ifnet *ifp, uint32_t txmax)
if (__predict_false(err)) { if (__predict_false(err)) {
if (err == ENOMEM) { if (err == ENOMEM) {
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
IFQ_LOCK(&ifp->if_snd); IFQ_LOCK(&ifp->if_snd);
IFQ_DRV_PREPEND(&ifp->if_snd, m); IFQ_DRV_PREPEND(&ifp->if_snd, m);
IFQ_UNLOCK(&ifp->if_snd); IFQ_UNLOCK(&ifp->if_snd);
} }
} }
if (err == 0 && m == NULL) { if (err == 0 && m == NULL) {
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
return (ENOBUFS); return (ENOBUFS);
} }
if ((err == 0) && (txq->size <= txq->in_use + TX_MAX_DESC) && if ((err == 0) && (txq->size <= txq->in_use + TX_MAX_DESC) &&