Various bugfixes from Stefano Garzarella:
1. oce_multiq_start(): make sure the buffer is consumed even on ENXIO 2. oce_multiq_transmit(): there is an extra call to drbr_enqueue() causing the mbuf to be enqueued twice when the NIC's queue is full, and potential panics 3. oce_multiq_transmit(): same problem fixed recently in ixgbe (r267187) and other drivers: if the mbuf is enqueued, the proper return value is 0 Submitted by: Stefano Garzarella MFC after: 3 days
This commit is contained in:
parent
98a2cc1f30
commit
d398c8634a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=268156
@ -563,9 +563,6 @@ oce_multiq_start(struct ifnet *ifp, struct mbuf *m)
|
||||
int queue_index = 0;
|
||||
int status = 0;
|
||||
|
||||
if (!sc->link_status)
|
||||
return ENXIO;
|
||||
|
||||
if ((m->m_flags & M_FLOWID) != 0)
|
||||
queue_index = m->m_pkthdr.flowid % sc->nwqs;
|
||||
|
||||
@ -1274,7 +1271,6 @@ oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, struct oce_wq *wq)
|
||||
drbr_putback(ifp, br, next);
|
||||
wq->tx_stats.tx_stops ++;
|
||||
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
|
||||
status = drbr_enqueue(ifp, br, next);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -1285,7 +1281,7 @@ oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, struct oce_wq *wq)
|
||||
ETHER_BPF_MTAP(ifp, next);
|
||||
}
|
||||
|
||||
return status;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user