svn commit: r208924 - stable/7/sys/dev/sge

[Pyun YongHyeon]

Author: yongari
Date: Tue Jun  8 19:36:41 2010
New Revision: 208924
URL: http://svn.freebsd.org/changeset/base/208924

Log:
  MFC r208806:
    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 >

Modified:
  stable/7/sys/dev/sge/if_sge.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/sge/if_sge.c
==============================================================================
--- stable/7/sys/dev/sge/if_sge.c	Tue Jun  8 19:26:22 2010	(r208923)
+++ stable/7/sys/dev/sge/if_sge.c	Tue Jun  8 19:36:41 2010	(r208924)
@@ -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;
 		}