svn commit: r276010 - stable/10/sys/dev/oce

[Steven Hartland]

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;
 }