From owner-svn-src-all@FreeBSD.ORG  Tue Apr 10 05:42:49 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A6D941065740;
	Tue, 10 Apr 2012 05:42:49 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 91C268FC1E;
	Tue, 10 Apr 2012 05:42:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q3A5gnKd005955;
	Tue, 10 Apr 2012 05:42:49 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3A5gn56005953;
	Tue, 10 Apr 2012 05:42:49 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201204100542.q3A5gn56005953@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 10 Apr 2012 05:42:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r234084 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2012 05:42:49 -0000

Author: glebius
Date: Tue Apr 10 05:42:48 2012
New Revision: 234084
URL: http://svn.freebsd.org/changeset/base/234084

Log:
  CARP should be capable to run on if_bridge(4). Unfortunately,
  this commit is not enough to enable CARP operation on
  if_bridge(4), because the latter doesn't handle or even
  initialize its ifp->if_link_state.
  
  Reported by:	Alexander Lunev <sol289 gmail.com>

Modified:
  head/sys/netinet/ip_carp.c

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c	Tue Apr 10 02:29:11 2012	(r234083)
+++ head/sys/netinet/ip_carp.c	Tue Apr 10 05:42:48 2012	(r234084)
@@ -1384,6 +1384,7 @@ carp_output(struct ifnet *ifp, struct mb
 	/* Set the source MAC address to the Virtual Router MAC Address. */
 	switch (ifp->if_type) {
 	case IFT_ETHER:
+	case IFT_BRIDGE:
 	case IFT_L2VLAN: {
 			struct ether_header *eh;
 
@@ -1604,6 +1605,7 @@ carp_ioctl(struct ifreq *ifr, u_long cmd
 	switch (ifp->if_type) {
 	case IFT_ETHER:
 	case IFT_L2VLAN:
+	case IFT_BRIDGE:
 	case IFT_FDDI:
 	case IFT_ISO88025:
 		break;