svn commit: r234084 - head/sys/netinet

[Gleb Smirnoff]

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;