From owner-svn-src-stable-8@FreeBSD.ORG  Wed Apr 28 18:28:09 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 51672106566B;
	Wed, 28 Apr 2010 18:28:09 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3F52D8FC16;
	Wed, 28 Apr 2010 18:28:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3SIS9Vi009440;
	Wed, 28 Apr 2010 18:28:09 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3SIS96B009438;
	Wed, 28 Apr 2010 18:28:09 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201004281828.o3SIS96B009438@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Wed, 28 Apr 2010 18:28:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207332 - stable/8/sys/dev/e1000
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Apr 2010 18:28:09 -0000

Author: jfv
Date: Wed Apr 28 18:28:08 2010
New Revision: 207332
URL: http://svn.freebsd.org/changeset/base/207332

Log:
  Only enable MAGIC WOL by default, MCAST causes
  systems to just wakeup immediately in many
  environments.

Modified:
  stable/8/sys/dev/e1000/if_em.c

Modified: stable/8/sys/dev/e1000/if_em.c
==============================================================================
--- stable/8/sys/dev/e1000/if_em.c	Wed Apr 28 17:37:30 2010	(r207331)
+++ stable/8/sys/dev/e1000/if_em.c	Wed Apr 28 18:28:08 2010	(r207332)
@@ -2707,10 +2707,10 @@ em_setup_interface(device_t dev, struct 
 	ifp->if_capabilities |= IFCAP_POLLING;
 #endif
 
-	/* Enable All WOL methods by default */
+	/* Enable only WOL MAGIC by default */
 	if (adapter->wol) {
 		ifp->if_capabilities |= IFCAP_WOL;
-		ifp->if_capenable |= IFCAP_WOL;
+		ifp->if_capenable |= IFCAP_WOL_MAGIC;
 	}
 		
 	/*