Author: luigi
Date: Wed Jul 2 12:13:11 2014
New Revision: 268156
URL: http://svnweb.freebsd.org/changeset/base/268156
Log:
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
Modified:
head/sys/dev/oce/oce_if.c
Modified: head/sys/dev/oce/oce_if.c
==============================================================================
--- head/sys/dev/oce/oce_if.c Wed Jul 2 11:51:01 2014 (r268155)
+++ head/sys/dev/oce/oce_if.c Wed Jul 2 12:13:11 2014 (r268156)
@@ -563,9 +563,6 @@ oce_multiq_start(struct ifnet *ifp, stru
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, s
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, s
ETHER_BPF_MTAP(ifp, next);
}
- return status;
+ return 0;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
