Date: Sun, 21 Dec 2014 15:39:20 +0000 (UTC) From: Steven Hartland <smh@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r276010 - stable/10/sys/dev/oce Message-ID: <201412211539.sBLFdKXO088083@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: smh Date: Sun Dec 21 15:39:19 2014 New Revision: 276010 URL: https://svnweb.freebsd.org/changeset/base/276010 Log: MFC r268156: Various bugfixes from Stefano GarzarellaA This has been proved to fix reproducable panics on 10.x. Sponsored by: Multiplay Modified: stable/10/sys/dev/oce/oce_if.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/oce/oce_if.c ============================================================================== --- stable/10/sys/dev/oce/oce_if.c Sun Dec 21 13:58:53 2014 (r276009) +++ stable/10/sys/dev/oce/oce_if.c Sun Dec 21 15:39:19 2014 (r276010) @@ -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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412211539.sBLFdKXO088083>