svn commit: r338873 - stable/11/sys/net

[Eric Joyner]

Author: erj
Date: Fri Sep 21 23:54:01 2018
New Revision: 338873
URL: https://svnweb.freebsd.org/changeset/base/338873

Log:
  Revert MFC of r334231 in r338871.
  
  It did not apply cleanly and was causing build errors.

Modified:
  stable/11/sys/net/iflib.c
  stable/11/sys/net/iflib.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/iflib.c
==============================================================================
--- stable/11/sys/net/iflib.c	Fri Sep 21 23:48:40 2018	(r338872)
+++ stable/11/sys/net/iflib.c	Fri Sep 21 23:54:01 2018	(r338873)
@@ -3703,10 +3703,6 @@ _task_fn_admin(void *context)
 		}
 	}
 
-	if ((!running & !oactive) &&
-	    !(ctx->ifc_sctx->isc_flags & IFLIB_ADMIN_ALWAYS_RUN))
-		return;
-
 	CTX_LOCK(ctx);
 	for (txq = ctx->ifc_txqs, i = 0; i < sctx->isc_ntxqsets; i++, txq++) {
 		CALLOUT_LOCK(txq);

Modified: stable/11/sys/net/iflib.h
==============================================================================
--- stable/11/sys/net/iflib.h	Fri Sep 21 23:48:40 2018	(r338872)
+++ stable/11/sys/net/iflib.h	Fri Sep 21 23:54:01 2018	(r338873)
@@ -321,10 +321,7 @@ typedef enum {
  * Driver needs frames padded to some minimum length
  */
 #define IFLIB_NEED_ETHER_PAD	0x100
-/*
- * Interface needs admin task to ignore interface up/down status
- */
-#define IFLIB_ADMIN_ALWAYS_RUN	0x10000
+
 
 
 /*