Module Name: src
Committed By: msaitoh
Date: Mon Feb 3 05:56:23 UTC 2014
Modified Files:
src/sys/dev/marvell: if_mvgbe.c
Log Message:
Carefully set IFF_OACTIVE in mvgbe_start(). Even if mvgbe_encap()
returns other than 0, the TX ring might not full. Check whether
the TX ring has one or more packets. If the ring is empty,
dont' set IFF_OACTIVE because an TX complete interrupt never
occur and IFF_OACTIVE flags is left. The interface's timer
isn't reset, so a device timeout desn't occur.
Fixes a bug that IFF_OACTIVE flag is left on heavy load.
Part of PR#48568.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/marvell/if_mvgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_mvgbe.c
diff -u src/sys/dev/marvell/if_mvgbe.c:1.35 src/sys/dev/marvell/if_mvgbe.c:1.36
--- src/sys/dev/marvell/if_mvgbe.c:1.35 Mon Dec 23 02:23:25 2013
+++ src/sys/dev/marvell/if_mvgbe.c Mon Feb 3 05:56:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mvgbe.c,v 1.35 2013/12/23 02:23:25 kiyohara Exp $ */
+/* $NetBSD: if_mvgbe.c,v 1.36 2014/02/03 05:56:23 msaitoh Exp $ */
/*
* Copyright (c) 2007, 2008, 2013 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.35 2013/12/23 02:23:25 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.36 2014/02/03 05:56:23 msaitoh Exp $");
#include "opt_multiprocessor.h"
@@ -1059,7 +1059,8 @@ mvgbe_start(struct ifnet *ifp)
* for the NIC to drain the ring.
*/
if (mvgbe_encap(sc, m_head, &idx)) {
- ifp->if_flags |= IFF_OACTIVE;
+ if (sc->sc_cdata.mvgbe_tx_cnt > 0)
+ ifp->if_flags |= IFF_OACTIVE;
break;
}
