From owner-svn-src-stable@FreeBSD.ORG  Sun Jan 24 14:58:49 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C27C51065693;
	Sun, 24 Jan 2010 14:58:49 +0000 (UTC)
	(envelope-from fjoe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B0C788FC21;
	Sun, 24 Jan 2010 14:58:49 +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 o0OEwnHM061555;
	Sun, 24 Jan 2010 14:58:49 GMT (envelope-from fjoe@svn.freebsd.org)
Received: (from fjoe@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0OEwnQm061553;
	Sun, 24 Jan 2010 14:58:49 GMT (envelope-from fjoe@svn.freebsd.org)
Message-Id: <201001241458.o0OEwnQm061553@svn.freebsd.org>
From: Max Khon <fjoe@FreeBSD.org>
Date: Sun, 24 Jan 2010 14:58:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202932 - stable/7/sys/netgraph
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2010 14:58:49 -0000

Author: fjoe
Date: Sun Jan 24 14:58:49 2010
New Revision: 202932
URL: http://svn.freebsd.org/changeset/base/202932

Log:
  MFC rev. 201924: Send link state change control messages
  to "orphans" hook as well.
  
  Approved by:	re (kib)

Modified:
  stable/7/sys/netgraph/ng_ether.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/netgraph/ng_ether.c
==============================================================================
--- stable/7/sys/netgraph/ng_ether.c	Sun Jan 24 14:57:54 2010	(r202931)
+++ stable/7/sys/netgraph/ng_ether.c	Sun Jan 24 14:58:49 2010	(r202932)
@@ -343,9 +343,6 @@ ng_ether_link_state(struct ifnet *ifp, i
 	struct ng_mesg *msg;
 	int cmd, dummy_error = 0;
 
-	if (priv->lower == NULL)
-                return;
-
 	if (state == LINK_STATE_UP)
 		cmd = NGM_LINK_IS_UP;
 	else if (state == LINK_STATE_DOWN)
@@ -353,9 +350,16 @@ ng_ether_link_state(struct ifnet *ifp, i
 	else
 		return;
 
-	NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
-	if (msg != NULL)
-		NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower, 0);
+	if (priv->lower != NULL) {
+		NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
+		if (msg != NULL)
+			NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->lower, 0);
+	}
+	if (priv->orphan != NULL) {
+		NG_MKMESSAGE(msg, NGM_FLOW_COOKIE, cmd, 0, M_NOWAIT);
+		if (msg != NULL)
+			NG_SEND_MSG_HOOK(dummy_error, node, msg, priv->orphan, 0);
+	}
 }
 
 /******************************************************************