svn commit: r208806 - head/sys/dev/sge

Pyun YongHyeon yongari at FreeBSD.org
Fri Jun 4 17:11:34 UTC 2010


Author: yongari
Date: Fri Jun  4 17:11:33 2010
New Revision: 208806
URL: http://svn.freebsd.org/changeset/base/208806

Log:
  Don't blindly set IFF_DRV_OACTIVE when sge_encap() fails. If there
  is no queued frame, IFF_DRV_OACTIVE would never be cleared.
  
  Submitted by:	Nikolay Denev < ndenev <> gmail at com >
  MFC after:	4 days

Modified:
  head/sys/dev/sge/if_sge.c

Modified: head/sys/dev/sge/if_sge.c
==============================================================================
--- head/sys/dev/sge/if_sge.c	Fri Jun  4 17:02:12 2010	(r208805)
+++ head/sys/dev/sge/if_sge.c	Fri Jun  4 17:11:33 2010	(r208806)
@@ -1588,8 +1588,9 @@ sge_start_locked(struct ifnet *ifp)
 		if (m_head == NULL)
 			break;
 		if (sge_encap(sc, &m_head)) {
-			if (m_head != NULL)
-				IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
+			if (m_head == NULL)
+				break;
+			IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			break;
 		}


More information about the svn-src-head mailing list