summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmh <smh@FreeBSD.org>2014-12-21 15:39:19 +0000
committersmh <smh@FreeBSD.org>2014-12-21 15:39:19 +0000
commit3b6e56e0bc47caf7b4d5edad6c18cd5e0773d5fa (patch)
tree107964fb49bc8cb88f892bb4cb391ad12b070362
parentd7139ba7f6d6696b9d96b4280781b2a9bc4b06af (diff)
downloadFreeBSD-src-3b6e56e0bc47caf7b4d5edad6c18cd5e0773d5fa.zip
FreeBSD-src-3b6e56e0bc47caf7b4d5edad6c18cd5e0773d5fa.tar.gz
MFC r268156:
Various bugfixes from Stefano GarzarellaA This has been proved to fix reproducable panics on 10.x. Sponsored by: Multiplay
-rw-r--r--sys/dev/oce/oce_if.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 273089f..d1035a3 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -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;
}
OpenPOWER on IntegriCloud