]> git.saurik.com Git - apple/xnu.git/blobdiff - bsd/net/if_bridge.c
xnu-6153.61.1.tar.gz
[apple/xnu.git] / bsd / net / if_bridge.c
index db581d740625b3ac7dfe071d10c9e5006627b28f..a3c90194dad3364e0aab539b1ec7fceef12bddfc 100644 (file)
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2004-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2019 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
  *       802.11, VLANs on Ethernet, etc.)  Figure out a nice way
  *       to bridge other types of interfaces (FDDI-FDDI, and maybe
  *       consider heterogenous bridges).
  *       802.11, VLANs on Ethernet, etc.)  Figure out a nice way
  *       to bridge other types of interfaces (FDDI-FDDI, and maybe
  *       consider heterogenous bridges).
+ *
+ *     - GIF isn't handled due to the lack of IPPROTO_ETHERIP support.
  */
 
 #include <sys/cdefs.h>
 
 #define BRIDGE_DEBUG 1
  */
 
 #include <sys/cdefs.h>
 
 #define BRIDGE_DEBUG 1
-#ifndef BRIDGE_DEBUG
-#define BRIDGE_DEBUG 0
-#endif /* BRIDGE_DEBUG */
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
 
 #include <sys/param.h>
 #include <sys/mbuf.h>
 
 #include <sys/kauth.h>
 
 
 #include <sys/kauth.h>
 
+#include <kern/thread_call.h>
+
 #include <libkern/libkern.h>
 
 #include <kern/zalloc.h>
 #include <libkern/libkern.h>
 
 #include <kern/zalloc.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_var.h>
+#include <net/if_media.h>
+#include <net/net_api_stats.h>
 
 #include <netinet/in.h> /* for struct arpcom */
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 
 #include <netinet/in.h> /* for struct arpcom */
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>
+#define _IP_VHL
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#ifdef INET6
+#if INET6
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
 #endif
 #include <netinet/ip_fw2.h>
 #include <netinet/ip_dummynet.h>
 #endif /* PFIL_HOOKS */
 #include <netinet/ip_fw2.h>
 #include <netinet/ip_dummynet.h>
 #endif /* PFIL_HOOKS */
+#include <dev/random/randomdev.h>
+
+#include <netinet/bootp.h>
+#include <netinet/dhcp.h>
+
+
+#if BRIDGE_DEBUG
+#define BR_DBGF_LIFECYCLE       0x0001
+#define BR_DBGF_INPUT           0x0002
+#define BR_DBGF_OUTPUT          0x0004
+#define BR_DBGF_RT_TABLE        0x0008
+#define BR_DBGF_DELAYED_CALL    0x0010
+#define BR_DBGF_IOCTL           0x0020
+#define BR_DBGF_MBUF            0x0040
+#define BR_DBGF_MCAST           0x0080
+#define BR_DBGF_HOSTFILTER      0x0100
+#define BR_DBGF_CHECKSUM        0x0200
+#endif /* BRIDGE_DEBUG */
+
+#define _BRIDGE_LOCK(_sc)               lck_mtx_lock(&(_sc)->sc_mtx)
+#define _BRIDGE_UNLOCK(_sc)             lck_mtx_unlock(&(_sc)->sc_mtx)
+#define BRIDGE_LOCK_ASSERT_HELD(_sc)            \
+       LCK_MTX_ASSERT(&(_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED)
+#define BRIDGE_LOCK_ASSERT_NOTHELD(_sc)         \
+       LCK_MTX_ASSERT(&(_sc)->sc_mtx, LCK_MTX_ASSERT_NOTOWNED)
 
 #if BRIDGE_DEBUG
 
 
 #if BRIDGE_DEBUG
 
-#define BR_LCKDBG_MAX                  4
-
-#define BRIDGE_LOCK(_sc)               bridge_lock(_sc)
-#define BRIDGE_UNLOCK(_sc)             bridge_unlock(_sc)
-#define BRIDGE_LOCK_ASSERT(_sc)                \
-       lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED)
-#define        BRIDGE_LOCK2REF(_sc, _err)      _err = bridge_lock2ref(_sc)
-#define        BRIDGE_UNREF(_sc)               bridge_unref(_sc)
-#define        BRIDGE_XLOCK(_sc)               bridge_xlock(_sc)
-#define        BRIDGE_XDROP(_sc)               bridge_xdrop(_sc)
-
-#else /* BRIDGE_DEBUG */
-
-#define BRIDGE_LOCK(_sc)               lck_mtx_lock((_sc)->sc_mtx)
-#define BRIDGE_UNLOCK(_sc)             lck_mtx_unlock((_sc)->sc_mtx)
-#define BRIDGE_LOCK_ASSERT(_sc)                \
-       lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED)
-#define        BRIDGE_LOCK2REF(_sc, _err)      do {                            \
-       lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED);            \
-       if ((_sc)->sc_iflist_xcnt > 0)                                  \
-               (_err) = EBUSY;                                         \
-       else                                                            \
-               (_sc)->sc_iflist_ref++;                                 \
-       lck_mtx_unlock((_sc)->sc_mtx);                                  \
+#define BR_LCKDBG_MAX                   4
+
+#define BRIDGE_LOCK(_sc)                bridge_lock(_sc)
+#define BRIDGE_UNLOCK(_sc)              bridge_unlock(_sc)
+#define BRIDGE_LOCK2REF(_sc, _err)      _err = bridge_lock2ref(_sc)
+#define BRIDGE_UNREF(_sc)               bridge_unref(_sc)
+#define BRIDGE_XLOCK(_sc)               bridge_xlock(_sc)
+#define BRIDGE_XDROP(_sc)               bridge_xdrop(_sc)
+
+#else /* !BRIDGE_DEBUG */
+
+#define BRIDGE_LOCK(_sc)                _BRIDGE_LOCK(_sc)
+#define BRIDGE_UNLOCK(_sc)              _BRIDGE_UNLOCK(_sc)
+#define BRIDGE_LOCK2REF(_sc, _err)      do {                            \
+       BRIDGE_LOCK_ASSERT_HELD(_sc);                                   \
+       if ((_sc)->sc_iflist_xcnt > 0)                                  \
+               (_err) = EBUSY;                                         \
+       else                                                            \
+               (_sc)->sc_iflist_ref++;                                 \
+       _BRIDGE_UNLOCK(_sc);                                            \
 } while (0)
 } while (0)
-#define        BRIDGE_UNREF(_sc)               do {                            \
-       lck_mtx_lock((_sc)->sc_mtx);                                    \
-       (_sc)->sc_iflist_ref--;                                         \
+#define BRIDGE_UNREF(_sc)               do {                            \
+       _BRIDGE_LOCK(_sc);                                              \
+       (_sc)->sc_iflist_ref--;                                         \
        if (((_sc)->sc_iflist_xcnt > 0) && ((_sc)->sc_iflist_ref == 0)) { \
        if (((_sc)->sc_iflist_xcnt > 0) && ((_sc)->sc_iflist_ref == 0)) { \
-               lck_mtx_unlock((_sc)->sc_mtx);                          \
-               wakeup(&(_sc)->sc_cv);                                  \
-       } else                                                          \
-               lck_mtx_unlock((_sc)->sc_mtx);                          \
+               _BRIDGE_UNLOCK(_sc);                                    \
+               wakeup(&(_sc)->sc_cv);                                  \
+       } else                                                          \
+               _BRIDGE_UNLOCK(_sc);                                    \
 } while (0)
 } while (0)
-#define        BRIDGE_XLOCK(_sc)               do {                            \
-       lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED);            \
-       (_sc)->sc_iflist_xcnt++;                                        \
-       while ((_sc)->sc_iflist_ref > 0)                                \
-               msleep(&(_sc)->sc_cv, (_sc)->sc_mtx, PZERO,             \
-                   "BRIDGE_XLOCK", NULL);                              \
+#define BRIDGE_XLOCK(_sc)               do {                            \
+       BRIDGE_LOCK_ASSERT_HELD(_sc);                                   \
+       (_sc)->sc_iflist_xcnt++;                                        \
+       while ((_sc)->sc_iflist_ref > 0)                                \
+               msleep(&(_sc)->sc_cv, &(_sc)->sc_mtx, PZERO,            \
+                   "BRIDGE_XLOCK", NULL);                              \
 } while (0)
 } while (0)
-#define        BRIDGE_XDROP(_sc)               do {                            \
-       lck_mtx_assert((_sc)->sc_mtx, LCK_MTX_ASSERT_OWNED);            \
-       (_sc)->sc_iflist_xcnt--;                                        \
+#define BRIDGE_XDROP(_sc)               do {                            \
+       BRIDGE_LOCK_ASSERT_HELD(_sc);                                   \
+       (_sc)->sc_iflist_xcnt--;                                        \
 } while (0)
 
 #endif /* BRIDGE_DEBUG */
 
 #if NBPFILTER > 0
 } while (0)
 
 #endif /* BRIDGE_DEBUG */
 
 #if NBPFILTER > 0
-#define BRIDGE_BPF_MTAP_INPUT(sc, m)                                   \
-       if (sc->sc_bpf_input)                                           \
-               bridge_bpf_input(sc->sc_ifp, m)
+#define BRIDGE_BPF_MTAP_INPUT(sc, m)                                    \
+       if (sc->sc_bpf_input)                                           \
+               bridge_bpf_input(sc->sc_ifp, m)
 #else /* NBPFILTER */
 #define BRIDGE_BPF_MTAP_INPUT(ifp, m)
 #endif /* NBPFILTER */
 
 /*
 #else /* NBPFILTER */
 #define BRIDGE_BPF_MTAP_INPUT(ifp, m)
 #endif /* NBPFILTER */
 
 /*
- * Size of the route hash table.  Must be a power of two.
+ * Initial size of the route hash table.  Must be a power of two.
  */
  */
-/* APPLE MODIFICATION - per Wasabi performance improvement, change the hash table size */
-#if 0
-#ifndef BRIDGE_RTHASH_SIZE
-#define        BRIDGE_RTHASH_SIZE              1024
-#endif
-#else
 #ifndef BRIDGE_RTHASH_SIZE
 #ifndef BRIDGE_RTHASH_SIZE
-#define        BRIDGE_RTHASH_SIZE              256
-#endif
+#define BRIDGE_RTHASH_SIZE              16
 #endif
 
 #endif
 
-/* APPLE MODIFICATION - support for HW checksums */
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
-#include <netinet/udp.h>
-#include <netinet/tcp.h>
-#endif
+/*
+ * Maximum size of the routing hash table
+ */
+#define BRIDGE_RTHASH_SIZE_MAX          2048
 
 
-#define        BRIDGE_RTHASH_MASK              (BRIDGE_RTHASH_SIZE - 1)
+#define BRIDGE_RTHASH_MASK(sc)          ((sc)->sc_rthash_size - 1)
 
 /*
  * Maximum number of addresses to cache.
  */
 #ifndef BRIDGE_RTABLE_MAX
 
 /*
  * Maximum number of addresses to cache.
  */
 #ifndef BRIDGE_RTABLE_MAX
-#define        BRIDGE_RTABLE_MAX               100
+#define BRIDGE_RTABLE_MAX               100
 #endif
 
 
 #endif
 
 
  * Timeout (in seconds) for entries learned dynamically.
  */
 #ifndef BRIDGE_RTABLE_TIMEOUT
  * Timeout (in seconds) for entries learned dynamically.
  */
 #ifndef BRIDGE_RTABLE_TIMEOUT
-#define        BRIDGE_RTABLE_TIMEOUT           (20 * 60)       /* same as ARP */
+#define BRIDGE_RTABLE_TIMEOUT           (20 * 60)       /* same as ARP */
 #endif
 
 /*
  * Number of seconds between walks of the route list.
  */
 #ifndef BRIDGE_RTABLE_PRUNE_PERIOD
 #endif
 
 /*
  * Number of seconds between walks of the route list.
  */
 #ifndef BRIDGE_RTABLE_PRUNE_PERIOD
-#define        BRIDGE_RTABLE_PRUNE_PERIOD      (5 * 60)
+#define BRIDGE_RTABLE_PRUNE_PERIOD      (5 * 60)
 #endif
 
 /*
  * List of capabilities to possibly mask on the member interface.
  */
 #endif
 
 /*
  * List of capabilities to possibly mask on the member interface.
  */
-#define        BRIDGE_IFCAPS_MASK              (IFCAP_TOE|IFCAP_TSO|IFCAP_TXCSUM)
+#define BRIDGE_IFCAPS_MASK              (IFCAP_TOE|IFCAP_TSO|IFCAP_TXCSUM)
 /*
  * List of capabilities to disable on the member interface.
  */
 /*
  * List of capabilities to disable on the member interface.
  */
-#define        BRIDGE_IFCAPS_STRIP             IFCAP_LRO
+#define BRIDGE_IFCAPS_STRIP             IFCAP_LRO
 
 /*
  * Bridge interface list entry.
  */
 struct bridge_iflist {
        TAILQ_ENTRY(bridge_iflist) bif_next;
 
 /*
  * Bridge interface list entry.
  */
 struct bridge_iflist {
        TAILQ_ENTRY(bridge_iflist) bif_next;
-       struct ifnet            *bif_ifp;       /* member if */
-       struct bstp_port        bif_stp;        /* STP state */
-       uint32_t                bif_flags;      /* member if flags */
-       int                     bif_savedcaps;  /* saved capabilities */
-       uint32_t                bif_addrmax;    /* max # of addresses */
-       uint32_t                bif_addrcnt;    /* cur. # of addresses */
-       uint32_t                bif_addrexceeded;/* # of address violations */
-
-       interface_filter_t      bif_iff_ref;
-       struct bridge_softc     *bif_sc;
-       char            bif_promisc;            /* promiscuous mode set */
-       char            bif_proto_attached;     /* protocol attached */
-       char            bif_filter_attached;    /* interface filter attached */
+       struct ifnet            *bif_ifp;       /* member if */
+       struct bstp_port        bif_stp;        /* STP state */
+       uint32_t                bif_ifflags;    /* member if flags */
+       int                     bif_savedcaps;  /* saved capabilities */
+       uint32_t                bif_addrmax;    /* max # of addresses */
+       uint32_t                bif_addrcnt;    /* cur. # of addresses */
+       uint32_t                bif_addrexceeded; /* # of address violations */
+
+       interface_filter_t      bif_iff_ref;
+       struct bridge_softc     *bif_sc;
+       uint32_t                bif_flags;
+
+       struct in_addr          bif_hf_ipsrc;
+       uint8_t                 bif_hf_hwsrc[ETHER_ADDR_LEN];
 };
 
 };
 
+#define BIFF_PROMISC            0x01    /* promiscuous mode set */
+#define BIFF_PROTO_ATTACHED     0x02    /* protocol attached */
+#define BIFF_FILTER_ATTACHED    0x04    /* interface filter attached */
+#define BIFF_MEDIA_ACTIVE       0x08    /* interface media active */
+#define BIFF_HOST_FILTER        0x10    /* host filter enabled */
+#define BIFF_HF_HWSRC           0x20    /* host filter source MAC is set */
+#define BIFF_HF_IPSRC           0x40    /* host filter source IP is set */
+#define BIFF_INPUT_BROADCAST    0x80    /* send broadcast packets in */
+
 /*
  * Bridge route node.
  */
 struct bridge_rtnode {
 /*
  * Bridge route node.
  */
 struct bridge_rtnode {
-       LIST_ENTRY(bridge_rtnode) brt_hash;     /* hash table linkage */
-       LIST_ENTRY(bridge_rtnode) brt_list;     /* list linkage */
-       struct bridge_iflist    *brt_dst;       /* destination if */
-       unsigned long           brt_expire;     /* expiration time */
-       uint8_t                 brt_flags;      /* address flags */
-       uint8_t                 brt_addr[ETHER_ADDR_LEN];
-       uint16_t                brt_vlan;       /* vlan id */
+       LIST_ENTRY(bridge_rtnode) brt_hash;     /* hash table linkage */
+       LIST_ENTRY(bridge_rtnode) brt_list;     /* list linkage */
+       struct bridge_iflist    *brt_dst;       /* destination if */
+       unsigned long           brt_expire;     /* expiration time */
+       uint8_t                 brt_flags;      /* address flags */
+       uint8_t                 brt_addr[ETHER_ADDR_LEN];
+       uint16_t                brt_vlan;       /* vlan id */
+
+};
+#define brt_ifp                 brt_dst->bif_ifp
 
 
+/*
+ * Bridge delayed function call context
+ */
+typedef void (*bridge_delayed_func_t)(struct bridge_softc *);
+
+struct bridge_delayed_call {
+       struct bridge_softc     *bdc_sc;
+       bridge_delayed_func_t   bdc_func; /* Function to call */
+       struct timespec         bdc_ts; /* Time to call */
+       u_int32_t               bdc_flags;
+       thread_call_t           bdc_thread_call;
 };
 };
-#define        brt_ifp                 brt_dst->bif_ifp
+
+#define BDCF_OUTSTANDING        0x01    /* Delayed call has been scheduled */
+#define BDCF_CANCELLING         0x02    /* May be waiting for call completion */
 
 /*
  * Software state for each bridge.
  */
 
 /*
  * Software state for each bridge.
  */
+LIST_HEAD(_bridge_rtnode_list, bridge_rtnode);
+
 struct bridge_softc {
 struct bridge_softc {
-       struct ifnet            *sc_ifp;        /* make this an interface */
+       struct ifnet            *sc_ifp;        /* make this an interface */
+       u_int32_t               sc_flags;
        LIST_ENTRY(bridge_softc) sc_list;
        LIST_ENTRY(bridge_softc) sc_list;
-       lck_mtx_t               *sc_mtx;
-       void                    *sc_cv;
-       uint32_t                sc_brtmax;      /* max # of addresses */
-       uint32_t                sc_brtcnt;      /* cur. # of addresses */
-       uint32_t                sc_brttimeout;  /* rt timeout in seconds */
-       uint32_t                sc_iflist_ref;  /* refcount for sc_iflist */
-       uint32_t                sc_iflist_xcnt; /* refcount for sc_iflist */
-       TAILQ_HEAD(, bridge_iflist) sc_iflist;  /* member interface list */
-       LIST_HEAD(, bridge_rtnode) *sc_rthash;  /* our forwarding table */
-       LIST_HEAD(, bridge_rtnode) sc_rtlist;   /* list version of above */
-       uint32_t                sc_rthash_key;  /* key for hash */
-       TAILQ_HEAD(, bridge_iflist) sc_spanlist;        /* span ports list */
-       struct bstp_state       sc_stp;         /* STP state */
-       uint32_t                sc_brtexceeded; /* # of cache drops */
-       uint32_t                sc_filter_flags; /* ipf and flags */
-
-       char                    sc_if_xname[IFNAMSIZ];
-       bpf_packet_func         sc_bpf_input;
-       bpf_packet_func         sc_bpf_output;
-       u_int32_t               sc_flags;
+       decl_lck_mtx_data(, sc_mtx);
+       struct _bridge_rtnode_list *sc_rthash;  /* our forwarding table */
+       struct _bridge_rtnode_list sc_rtlist;   /* list version of above */
+       uint32_t                sc_rthash_key;  /* key for hash */
+       uint32_t                sc_rthash_size; /* size of the hash table */
+       struct bridge_delayed_call sc_aging_timer;
+       struct bridge_delayed_call sc_resize_call;
+       TAILQ_HEAD(, bridge_iflist) sc_spanlist;        /* span ports list */
+       struct bstp_state       sc_stp;         /* STP state */
+       bpf_packet_func         sc_bpf_input;
+       bpf_packet_func         sc_bpf_output;
+       void                    *sc_cv;
+       uint32_t                sc_brtmax;      /* max # of addresses */
+       uint32_t                sc_brtcnt;      /* cur. # of addresses */
+       uint32_t                sc_brttimeout;  /* rt timeout in seconds */
+       uint32_t                sc_iflist_ref;  /* refcount for sc_iflist */
+       uint32_t                sc_iflist_xcnt; /* refcount for sc_iflist */
+       TAILQ_HEAD(, bridge_iflist) sc_iflist;  /* member interface list */
+       uint32_t                sc_brtexceeded; /* # of cache drops */
+       uint32_t                sc_filter_flags; /* ipf and flags */
+       struct ifnet            *sc_ifaddr;     /* member mac copied from */
+       u_char                  sc_defaddr[6];  /* Default MAC address */
+       char                    sc_if_xname[IFNAMSIZ];
 
 #if BRIDGE_DEBUG
 
 #if BRIDGE_DEBUG
-       void                    *lock_lr[BR_LCKDBG_MAX];        /* locking calling history */
-       int                     next_lock_lr;
-       void                    *unlock_lr[BR_LCKDBG_MAX];      /* unlocking caller history */
-       int                     next_unlock_lr;
+       /*
+        * Locking and unlocking calling history
+        */
+       void                    *lock_lr[BR_LCKDBG_MAX];
+       int                     next_lock_lr;
+       void                    *unlock_lr[BR_LCKDBG_MAX];
+       int                     next_unlock_lr;
 #endif /* BRIDGE_DEBUG */
 };
 
 #endif /* BRIDGE_DEBUG */
 };
 
-#define SCF_DETACHING 0x1
+#define SCF_DETACHING 0x01
+#define SCF_RESIZING 0x02
+#define SCF_MEDIA_ACTIVE 0x04
+
+typedef enum {
+       kChecksumOperationNone = 0,
+       kChecksumOperationClear = 1,
+       kChecksumOperationFinalize = 2,
+       kChecksumOperationCompute = 3,
+} ChecksumOperation;
 
 
-decl_lck_mtx_data(static, bridge_list_mtx_data);
-static lck_mtx_t       *bridge_list_mtx = &bridge_list_mtx_data;
+struct bridge_hostfilter_stats bridge_hostfilter_stats;
 
 
-int    bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD;
+decl_lck_mtx_data(static, bridge_list_mtx);
 
 
-static zone_t bridge_rtnode_pool = NULL;
+static int      bridge_rtable_prune_period = BRIDGE_RTABLE_PRUNE_PERIOD;
 
 
-static int     bridge_clone_create(struct if_clone *, uint32_t, void *);
-static int     bridge_clone_destroy(struct ifnet *);
+static zone_t   bridge_rtnode_pool = NULL;
 
 
-static errno_t bridge_ioctl(struct ifnet *, u_long, void *);
+static int      bridge_clone_create(struct if_clone *, uint32_t, void *);
+static int      bridge_clone_destroy(struct ifnet *);
+
+static errno_t  bridge_ioctl(struct ifnet *, u_long, void *);
 #if HAS_IF_CAP
 #if HAS_IF_CAP
-static void    bridge_mutecaps(struct bridge_softc *);
-static void    bridge_set_ifcap(struct bridge_softc *, struct bridge_iflist *,
-                   int);
+static void     bridge_mutecaps(struct bridge_softc *);
+static void     bridge_set_ifcap(struct bridge_softc *, struct bridge_iflist *,
+    int);
 #endif
 #endif
-__private_extern__ void        bridge_ifdetach(struct bridge_iflist *, struct ifnet *);
-static int     bridge_init(struct ifnet *);
+static errno_t bridge_set_tso(struct bridge_softc *);
+static void     bridge_ifdetach(struct ifnet *);
+static void     bridge_proto_attach_changed(struct ifnet *);
+static int      bridge_init(struct ifnet *);
 #if HAS_BRIDGE_DUMMYNET
 #if HAS_BRIDGE_DUMMYNET
-static void    bridge_dummynet(struct mbuf *, struct ifnet *);
+static void     bridge_dummynet(struct mbuf *, struct ifnet *);
 #endif
 #endif
-static void    bridge_ifstop(struct ifnet *, int);
-static int     bridge_output(struct ifnet *, struct mbuf *);
-static void    bridge_start(struct ifnet *);
+static void     bridge_ifstop(struct ifnet *, int);
+static int      bridge_output(struct ifnet *, struct mbuf *);
+static void     bridge_finalize_cksum(struct ifnet *, struct mbuf *);
+static void     bridge_start(struct ifnet *);
 __private_extern__ errno_t bridge_input(struct ifnet *, struct mbuf *, void *);
 __private_extern__ errno_t bridge_input(struct ifnet *, struct mbuf *, void *);
-#if BRIDGE_MEMBER_OUT_FILTER
-static errno_t bridge_iff_output(void *, ifnet_t, protocol_family_t ,
+static errno_t  bridge_iff_output(void *, ifnet_t, protocol_family_t,
     mbuf_t *);
     mbuf_t *);
-static int     bridge_member_output(struct ifnet *, struct mbuf *,
-                   struct sockaddr *, struct rtentry *);
-#endif
-static int     bridge_enqueue(struct bridge_softc *, struct ifnet *,
-                   struct mbuf *);
-static void    bridge_rtdelete(struct bridge_softc *, struct ifnet *ifp, int);
+static errno_t  bridge_member_output(struct bridge_softc *sc, ifnet_t ifp,
+    mbuf_t m);
 
 
-static void    bridge_forward(struct bridge_softc *, struct bridge_iflist *,
-                   struct mbuf *m);
+static int      bridge_enqueue(struct bridge_softc *, struct ifnet *,
+    struct ifnet *, struct mbuf *, ChecksumOperation);
+static void     bridge_rtdelete(struct bridge_softc *, struct ifnet *ifp, int);
 
 
-static void    bridge_timer(void *);
+static void     bridge_forward(struct bridge_softc *, struct bridge_iflist *,
+    struct mbuf *);
 
 
-static void    bridge_broadcast(struct bridge_softc *, struct ifnet *,
-                   struct mbuf *, int);
-static void    bridge_span(struct bridge_softc *, struct mbuf *);
+static void     bridge_aging_timer(struct bridge_softc *sc);
 
 
-static int     bridge_rtupdate(struct bridge_softc *, const uint8_t *,
-                   uint16_t, struct bridge_iflist *, int, uint8_t);
+static void     bridge_broadcast(struct bridge_softc *, struct ifnet *,
+    struct mbuf *, int);
+static void     bridge_span(struct bridge_softc *, struct mbuf *);
+
+static int      bridge_rtupdate(struct bridge_softc *, const uint8_t *,
+    uint16_t, struct bridge_iflist *, int, uint8_t);
 static struct ifnet *bridge_rtlookup(struct bridge_softc *, const uint8_t *,
 static struct ifnet *bridge_rtlookup(struct bridge_softc *, const uint8_t *,
-                   uint16_t);
-static void    bridge_rttrim(struct bridge_softc *);
-static void    bridge_rtage(struct bridge_softc *);
-static void    bridge_rtflush(struct bridge_softc *, int);
-static int     bridge_rtdaddr(struct bridge_softc *, const uint8_t *,
-                   uint16_t);
+    uint16_t);
+static void     bridge_rttrim(struct bridge_softc *);
+static void     bridge_rtage(struct bridge_softc *);
+static void     bridge_rtflush(struct bridge_softc *, int);
+static int      bridge_rtdaddr(struct bridge_softc *, const uint8_t *,
+    uint16_t);
+
+static int      bridge_rtable_init(struct bridge_softc *);
+static void     bridge_rtable_fini(struct bridge_softc *);
 
 
-static int     bridge_rtable_init(struct bridge_softc *);
-static void    bridge_rtable_fini(struct bridge_softc *);
+static void     bridge_rthash_resize(struct bridge_softc *);
 
 
-static int     bridge_rtnode_addr_cmp(const uint8_t *, const uint8_t *);
+static int      bridge_rtnode_addr_cmp(const uint8_t *, const uint8_t *);
 static struct bridge_rtnode *bridge_rtnode_lookup(struct bridge_softc *,
 static struct bridge_rtnode *bridge_rtnode_lookup(struct bridge_softc *,
-                   const uint8_t *, uint16_t);
-static int     bridge_rtnode_insert(struct bridge_softc *,
-                   struct bridge_rtnode *);
-static void    bridge_rtnode_destroy(struct bridge_softc *,
-                   struct bridge_rtnode *);
+    const uint8_t *, uint16_t);
+static int      bridge_rtnode_hash(struct bridge_softc *,
+    struct bridge_rtnode *);
+static int      bridge_rtnode_insert(struct bridge_softc *,
+    struct bridge_rtnode *);
+static void     bridge_rtnode_destroy(struct bridge_softc *,
+    struct bridge_rtnode *);
 #if BRIDGESTP
 #if BRIDGESTP
-static void    bridge_rtable_expire(struct ifnet *, int);
-static void    bridge_state_change(struct ifnet *, int);
+static void     bridge_rtable_expire(struct ifnet *, int);
+static void     bridge_state_change(struct ifnet *, int);
 #endif /* BRIDGESTP */
 
 static struct bridge_iflist *bridge_lookup_member(struct bridge_softc *,
 #endif /* BRIDGESTP */
 
 static struct bridge_iflist *bridge_lookup_member(struct bridge_softc *,
-                   const char *name);
+    const char *name);
 static struct bridge_iflist *bridge_lookup_member_if(struct bridge_softc *,
 static struct bridge_iflist *bridge_lookup_member_if(struct bridge_softc *,
-                   struct ifnet *ifp);
-static void    bridge_delete_member(struct bridge_softc *,
-                   struct bridge_iflist *, int);
-static void    bridge_delete_span(struct bridge_softc *,
-                   struct bridge_iflist *);
-
-static int     bridge_ioctl_add(struct bridge_softc *, void *);
-static int     bridge_ioctl_del(struct bridge_softc *, void *);
-static int     bridge_ioctl_gifflags(struct bridge_softc *, void *);
-static int     bridge_ioctl_sifflags(struct bridge_softc *, void *);
-static int     bridge_ioctl_scache(struct bridge_softc *, void *);
-static int     bridge_ioctl_gcache(struct bridge_softc *, void *);
-static int     bridge_ioctl_gifs32(struct bridge_softc *, void *);
-static int     bridge_ioctl_gifs64(struct bridge_softc *, void *);
-static int     bridge_ioctl_rts32(struct bridge_softc *, void *);
-static int     bridge_ioctl_rts64(struct bridge_softc *, void *);
-static int     bridge_ioctl_saddr32(struct bridge_softc *, void *);
-static int     bridge_ioctl_saddr64(struct bridge_softc *, void *);
-static int     bridge_ioctl_sto(struct bridge_softc *, void *);
-static int     bridge_ioctl_gto(struct bridge_softc *, void *);
-static int     bridge_ioctl_daddr32(struct bridge_softc *, void *);
-static int     bridge_ioctl_daddr64(struct bridge_softc *, void *);
-static int     bridge_ioctl_flush(struct bridge_softc *, void *);
-static int     bridge_ioctl_gpri(struct bridge_softc *, void *);
-static int     bridge_ioctl_spri(struct bridge_softc *, void *);
-static int     bridge_ioctl_ght(struct bridge_softc *, void *);
-static int     bridge_ioctl_sht(struct bridge_softc *, void *);
-static int     bridge_ioctl_gfd(struct bridge_softc *, void *);
-static int     bridge_ioctl_sfd(struct bridge_softc *, void *);
-static int     bridge_ioctl_gma(struct bridge_softc *, void *);
-static int     bridge_ioctl_sma(struct bridge_softc *, void *);
-static int     bridge_ioctl_sifprio(struct bridge_softc *, void *);
-static int     bridge_ioctl_sifcost(struct bridge_softc *, void *);
-static int     bridge_ioctl_sifmaxaddr(struct bridge_softc *, void *);
-static int     bridge_ioctl_addspan(struct bridge_softc *, void *);
-static int     bridge_ioctl_delspan(struct bridge_softc *, void *);
-static int     bridge_ioctl_gbparam32(struct bridge_softc *, void *);
-static int     bridge_ioctl_gbparam64(struct bridge_softc *, void *);
-static int     bridge_ioctl_grte(struct bridge_softc *, void *);
-static int     bridge_ioctl_gifsstp32(struct bridge_softc *, void *);
-static int     bridge_ioctl_gifsstp64(struct bridge_softc *, void *);
-static int     bridge_ioctl_sproto(struct bridge_softc *, void *);
-static int     bridge_ioctl_stxhc(struct bridge_softc *, void *);
-static int  bridge_ioctl_purge(struct bridge_softc *sc, void *arg);
-static int     bridge_ioctl_gfilt(struct bridge_softc *, void *);
-static int     bridge_ioctl_sfilt(struct bridge_softc *, void *);
+    struct ifnet *ifp);
+static void     bridge_delete_member(struct bridge_softc *,
+    struct bridge_iflist *, int);
+static void     bridge_delete_span(struct bridge_softc *,
+    struct bridge_iflist *);
+
+static int      bridge_ioctl_add(struct bridge_softc *, void *);
+static int      bridge_ioctl_del(struct bridge_softc *, void *);
+static int      bridge_ioctl_gifflags(struct bridge_softc *, void *);
+static int      bridge_ioctl_sifflags(struct bridge_softc *, void *);
+static int      bridge_ioctl_scache(struct bridge_softc *, void *);
+static int      bridge_ioctl_gcache(struct bridge_softc *, void *);
+static int      bridge_ioctl_gifs32(struct bridge_softc *, void *);
+static int      bridge_ioctl_gifs64(struct bridge_softc *, void *);
+static int      bridge_ioctl_rts32(struct bridge_softc *, void *);
+static int      bridge_ioctl_rts64(struct bridge_softc *, void *);
+static int      bridge_ioctl_saddr32(struct bridge_softc *, void *);
+static int      bridge_ioctl_saddr64(struct bridge_softc *, void *);
+static int      bridge_ioctl_sto(struct bridge_softc *, void *);
+static int      bridge_ioctl_gto(struct bridge_softc *, void *);
+static int      bridge_ioctl_daddr32(struct bridge_softc *, void *);
+static int      bridge_ioctl_daddr64(struct bridge_softc *, void *);
+static int      bridge_ioctl_flush(struct bridge_softc *, void *);
+static int      bridge_ioctl_gpri(struct bridge_softc *, void *);
+static int      bridge_ioctl_spri(struct bridge_softc *, void *);
+static int      bridge_ioctl_ght(struct bridge_softc *, void *);
+static int      bridge_ioctl_sht(struct bridge_softc *, void *);
+static int      bridge_ioctl_gfd(struct bridge_softc *, void *);
+static int      bridge_ioctl_sfd(struct bridge_softc *, void *);
+static int      bridge_ioctl_gma(struct bridge_softc *, void *);
+static int      bridge_ioctl_sma(struct bridge_softc *, void *);
+static int      bridge_ioctl_sifprio(struct bridge_softc *, void *);
+static int      bridge_ioctl_sifcost(struct bridge_softc *, void *);
+static int      bridge_ioctl_sifmaxaddr(struct bridge_softc *, void *);
+static int      bridge_ioctl_addspan(struct bridge_softc *, void *);
+static int      bridge_ioctl_delspan(struct bridge_softc *, void *);
+static int      bridge_ioctl_gbparam32(struct bridge_softc *, void *);
+static int      bridge_ioctl_gbparam64(struct bridge_softc *, void *);
+static int      bridge_ioctl_grte(struct bridge_softc *, void *);
+static int      bridge_ioctl_gifsstp32(struct bridge_softc *, void *);
+static int      bridge_ioctl_gifsstp64(struct bridge_softc *, void *);
+static int      bridge_ioctl_sproto(struct bridge_softc *, void *);
+static int      bridge_ioctl_stxhc(struct bridge_softc *, void *);
+static int      bridge_ioctl_purge(struct bridge_softc *sc, void *);
+static int      bridge_ioctl_gfilt(struct bridge_softc *, void *);
+static int      bridge_ioctl_sfilt(struct bridge_softc *, void *);
+static int      bridge_ioctl_ghostfilter(struct bridge_softc *, void *);
+static int      bridge_ioctl_shostfilter(struct bridge_softc *, void *);
 #ifdef PFIL_HOOKS
 #ifdef PFIL_HOOKS
-static int     bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *,
-                   int);
-static int     bridge_ip_checkbasic(struct mbuf **mp);
+static int      bridge_pfil(struct mbuf **, struct ifnet *, struct ifnet *,
+    int);
+static int      bridge_ip_checkbasic(struct mbuf **);
 #ifdef INET6
 #ifdef INET6
-static int     bridge_ip6_checkbasic(struct mbuf **mp);
+static int      bridge_ip6_checkbasic(struct mbuf **);
 #endif /* INET6 */
 #endif /* INET6 */
-static int     bridge_fragment(struct ifnet *, struct mbuf *,
-                   struct ether_header *, int, struct llc *);
+static int      bridge_fragment(struct ifnet *, struct mbuf *,
+    struct ether_header *, int, struct llc *);
 #endif /* PFIL_HOOKS */
 
 #endif /* PFIL_HOOKS */
 
-static errno_t bridge_set_bpf_tap(ifnet_t ifn, bpf_tap_mode mode, bpf_packet_func bpf_callback);
-__private_extern__ errno_t bridge_bpf_input(ifnet_t ifp, struct mbuf *m);
-__private_extern__ errno_t bridge_bpf_output(ifnet_t ifp, struct mbuf *m);
+static errno_t bridge_set_bpf_tap(ifnet_t, bpf_tap_mode, bpf_packet_func);
+__private_extern__ errno_t bridge_bpf_input(ifnet_t, struct mbuf *);
+__private_extern__ errno_t bridge_bpf_output(ifnet_t, struct mbuf *);
 
 
-static void bridge_detach(ifnet_t ifp);
+static void bridge_detach(ifnet_t);
+static void bridge_link_event(struct ifnet *, u_int32_t);
+static void bridge_iflinkevent(struct ifnet *);
+static u_int32_t bridge_updatelinkstatus(struct bridge_softc *);
+static int interface_media_active(struct ifnet *);
+static void bridge_schedule_delayed_call(struct bridge_delayed_call *);
+static void bridge_cancel_delayed_call(struct bridge_delayed_call *);
+static void bridge_cleanup_delayed_call(struct bridge_delayed_call *);
+static int bridge_host_filter(struct bridge_iflist *, struct mbuf *);
 
 #define m_copypacket(m, how) m_copym(m, 0, M_COPYALL, how)
 
 /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */
 
 #define m_copypacket(m, how) m_copym(m, 0, M_COPYALL, how)
 
 /* The default bridge vlan is 1 (IEEE 802.1Q-2003 Table 9-2) */
-#define        VLANTAGOF(_m)   0
+#define VLANTAGOF(_m)   0
 
 u_int8_t bstp_etheraddr[ETHER_ADDR_LEN] =
 
 u_int8_t bstp_etheraddr[ETHER_ADDR_LEN] =
-    { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
+{ 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
+
+static u_int8_t ethernulladdr[ETHER_ADDR_LEN] =
+{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 #if BRIDGESTP
 static struct bstp_cb_ops bridge_ops = {
 
 #if BRIDGESTP
 static struct bstp_cb_ops bridge_ops = {
@@ -502,27 +583,56 @@ static struct bstp_cb_ops bridge_ops = {
 #endif /* BRIDGESTP */
 
 SYSCTL_DECL(_net_link);
 #endif /* BRIDGESTP */
 
 SYSCTL_DECL(_net_link);
-SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW|CTLFLAG_LOCKED, 0,
+SYSCTL_NODE(_net_link, IFT_BRIDGE, bridge, CTLFLAG_RW | CTLFLAG_LOCKED, 0,
     "Bridge");
 
     "Bridge");
 
+static int bridge_inherit_mac = 0;   /* share MAC with first bridge member */
+SYSCTL_INT(_net_link_bridge, OID_AUTO, inherit_mac,
+    CTLFLAG_RW | CTLFLAG_LOCKED,
+    &bridge_inherit_mac, 0,
+    "Inherit MAC address from the first bridge member");
+
+SYSCTL_INT(_net_link_bridge, OID_AUTO, rtable_prune_period,
+    CTLFLAG_RW | CTLFLAG_LOCKED,
+    &bridge_rtable_prune_period, 0,
+    "Interval between pruning of routing table");
+
+static unsigned int bridge_rtable_hash_size_max = BRIDGE_RTHASH_SIZE_MAX;
+SYSCTL_UINT(_net_link_bridge, OID_AUTO, rtable_hash_size_max,
+    CTLFLAG_RW | CTLFLAG_LOCKED,
+    &bridge_rtable_hash_size_max, 0,
+    "Maximum size of the routing hash table");
+
+#if BRIDGE_DEBUG_DELAYED_CALLBACK
+static int bridge_delayed_callback_delay = 0;
+SYSCTL_INT(_net_link_bridge, OID_AUTO, delayed_callback_delay,
+    CTLFLAG_RW | CTLFLAG_LOCKED,
+    &bridge_delayed_callback_delay, 0,
+    "Delay before calling delayed function");
+#endif
+
+SYSCTL_STRUCT(_net_link_bridge, OID_AUTO,
+    hostfilterstats, CTLFLAG_RD | CTLFLAG_LOCKED,
+    &bridge_hostfilter_stats, bridge_hostfilter_stats, "");
+
 #if defined(PFIL_HOOKS)
 static int pfil_onlyip = 1; /* only pass IP[46] packets when pfil is enabled */
 static int pfil_bridge = 1; /* run pfil hooks on the bridge interface */
 static int pfil_member = 1; /* run pfil hooks on the member interface */
 static int pfil_ipfw = 0;   /* layer2 filter with ipfw */
 static int pfil_ipfw_arp = 0;   /* layer2 filter with ipfw */
 #if defined(PFIL_HOOKS)
 static int pfil_onlyip = 1; /* only pass IP[46] packets when pfil is enabled */
 static int pfil_bridge = 1; /* run pfil hooks on the bridge interface */
 static int pfil_member = 1; /* run pfil hooks on the member interface */
 static int pfil_ipfw = 0;   /* layer2 filter with ipfw */
 static int pfil_ipfw_arp = 0;   /* layer2 filter with ipfw */
-static int pfil_local_phys = 0; /* run pfil hooks on the physical interface for
-                                   locally destined packets */
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_onlyip, CTLFLAG_RW|CTLFLAG_LOCKED,
+static int pfil_local_phys = 0; /* run pfil hooks on the physical interface */
+                                /* for locally destined packets */
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_onlyip, CTLFLAG_RW | CTLFLAG_LOCKED,
     &pfil_onlyip, 0, "Only pass IP packets when pfil is enabled");
     &pfil_onlyip, 0, "Only pass IP packets when pfil is enabled");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, ipfw_arp, CTLFLAG_RW|CTLFLAG_LOCKED,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, ipfw_arp, CTLFLAG_RW | CTLFLAG_LOCKED,
     &pfil_ipfw_arp, 0, "Filter ARP packets through IPFW layer2");
     &pfil_ipfw_arp, 0, "Filter ARP packets through IPFW layer2");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_bridge, CTLFLAG_RW|CTLFLAG_LOCKED,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_bridge, CTLFLAG_RW | CTLFLAG_LOCKED,
     &pfil_bridge, 0, "Packet filter on the bridge interface");
     &pfil_bridge, 0, "Packet filter on the bridge interface");
-SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_member, CTLFLAG_RW|CTLFLAG_LOCKED,
+SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_member, CTLFLAG_RW | CTLFLAG_LOCKED,
     &pfil_member, 0, "Packet filter on the member interface");
 SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_local_phys,
     &pfil_member, 0, "Packet filter on the member interface");
 SYSCTL_INT(_net_link_bridge, OID_AUTO, pfil_local_phys,
-    CTLFLAG_RW|CTLFLAG_LOCKED, &pfil_local_phys, 0,
+    CTLFLAG_RW | CTLFLAG_LOCKED, &pfil_local_phys, 0,
     "Packet filter on the physical interface for locally destined packets");
 #endif /* PFIL_HOOKS */
 
     "Packet filter on the physical interface for locally destined packets");
 #endif /* PFIL_HOOKS */
 
@@ -533,203 +643,213 @@ SYSCTL_INT(_net_link_bridge, OID_AUTO, log_stp, CTLFLAG_RW,
 #endif /* BRIDGESTP */
 
 struct bridge_control {
 #endif /* BRIDGESTP */
 
 struct bridge_control {
-       int             (*bc_func)(struct bridge_softc *, void *);
-       unsigned int    bc_argsize;
-       unsigned int    bc_flags;
+       int             (*bc_func)(struct bridge_softc *, void *);
+       unsigned int    bc_argsize;
+       unsigned int    bc_flags;
 };
 
 };
 
-#define        BC_F_COPYIN             0x01    /* copy arguments in */
-#define        BC_F_COPYOUT            0x02    /* copy arguments out */
-#define        BC_F_SUSER              0x04    /* do super-user check */
+#define BC_F_COPYIN             0x01    /* copy arguments in */
+#define BC_F_COPYOUT            0x02    /* copy arguments out */
+#define BC_F_SUSER              0x04    /* do super-user check */
 
 static const struct bridge_control bridge_control_table32[] = {
 
 static const struct bridge_control bridge_control_table32[] = {
-       { bridge_ioctl_add,             sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
-       { bridge_ioctl_del,             sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_add, .bc_argsize = sizeof(struct ifbreq),             /* 0 */
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+       { .bc_func = bridge_ioctl_del, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gifflags,        sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_COPYOUT },
-       { bridge_ioctl_sifflags,        sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gifflags, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sifflags, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_scache,          sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
-       { bridge_ioctl_gcache,          sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_scache, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gcache, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
 
 
-       { bridge_ioctl_gifs32,          sizeof (struct ifbifconf32),
-           BC_F_COPYIN|BC_F_COPYOUT },
-       { bridge_ioctl_rts32,           sizeof (struct ifbaconf32),
-           BC_F_COPYIN|BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_gifs32, .bc_argsize = sizeof(struct ifbifconf32),
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_rts32, .bc_argsize = sizeof(struct ifbaconf32),
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
 
 
-       { bridge_ioctl_saddr32,         sizeof (struct ifbareq32),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_saddr32, .bc_argsize = sizeof(struct ifbareq32),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_sto,             sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
-       { bridge_ioctl_gto,             sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sto, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gto, .bc_argsize = sizeof(struct ifbrparam),           /* 10 */
+         .bc_flags = BC_F_COPYOUT },
 
 
-       { bridge_ioctl_daddr32,         sizeof (struct ifbareq32),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_daddr32, .bc_argsize = sizeof(struct ifbareq32),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_flush,           sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_flush, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gpri,            sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_spri,            sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gpri, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_spri, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_ght,             sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_sht,             sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_ght, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sht, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gfd,             sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_sfd,             sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gfd, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sfd, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gma,             sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_sma,             sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gma, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sma, .bc_argsize = sizeof(struct ifbrparam),           /* 20 */
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_sifprio,         sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_sifprio, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_sifcost,         sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_sifcost, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gfilt,           sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_sfilt,           sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gfilt, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sfilt, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_purge,           sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_purge, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_addspan,         sizeof (struct ifbreq),
-               BC_F_COPYIN|BC_F_SUSER },
-       { bridge_ioctl_delspan,         sizeof (struct ifbreq),
-               BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_addspan, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+       { .bc_func = bridge_ioctl_delspan, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gbparam32,       sizeof (struct ifbropreq32),
-           BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_gbparam32, .bc_argsize = sizeof(struct ifbropreq32),
+         .bc_flags = BC_F_COPYOUT },
 
 
-       { bridge_ioctl_grte,            sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_grte, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
 
 
-       { bridge_ioctl_gifsstp32,       sizeof (struct ifbpstpconf32),
-           BC_F_COPYIN|BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_gifsstp32, .bc_argsize = sizeof(struct ifbpstpconf32),     /* 30 */
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
 
 
-       { bridge_ioctl_sproto,          sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_sproto, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_stxhc,           sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_stxhc, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_sifmaxaddr,      sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_sifmaxaddr, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+
+       { .bc_func = bridge_ioctl_ghostfilter, .bc_argsize = sizeof(struct ifbrhostfilter),
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_shostfilter, .bc_argsize = sizeof(struct ifbrhostfilter),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 };
 
 static const struct bridge_control bridge_control_table64[] = {
 };
 
 static const struct bridge_control bridge_control_table64[] = {
-       { bridge_ioctl_add,             sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
-       { bridge_ioctl_del,             sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_add, .bc_argsize = sizeof(struct ifbreq),           /* 0 */
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+       { .bc_func = bridge_ioctl_del, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+
+       { .bc_func = bridge_ioctl_gifflags, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sifflags, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gifflags,        sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_COPYOUT },
-       { bridge_ioctl_sifflags,        sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_scache, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gcache, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
 
 
-       { bridge_ioctl_scache,          sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
-       { bridge_ioctl_gcache,          sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_gifs64, .bc_argsize = sizeof(struct ifbifconf64),
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_rts64, .bc_argsize = sizeof(struct ifbaconf64),
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
 
 
-       { bridge_ioctl_gifs64,          sizeof (struct ifbifconf64),
-           BC_F_COPYIN|BC_F_COPYOUT },
-       { bridge_ioctl_rts64,           sizeof (struct ifbaconf64),
-           BC_F_COPYIN|BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_saddr64, .bc_argsize = sizeof(struct ifbareq64),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_saddr64,         sizeof (struct ifbareq64),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_sto, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gto, .bc_argsize = sizeof(struct ifbrparam),           /* 10 */
+         .bc_flags = BC_F_COPYOUT },
 
 
-       { bridge_ioctl_sto,             sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
-       { bridge_ioctl_gto,             sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_daddr64, .bc_argsize = sizeof(struct ifbareq64),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_daddr64,         sizeof (struct ifbareq64),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_flush, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_flush,           sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gpri, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_spri, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gpri,            sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_spri,            sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_ght, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sht, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_ght,             sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_sht,             sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gfd, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sfd, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gfd,             sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_sfd,             sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gma, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sma, .bc_argsize = sizeof(struct ifbrparam),           /* 20 */
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gma,             sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_sma,             sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_sifprio, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_sifprio,         sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_sifcost, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_sifcost,         sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gfilt, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sfilt, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_gfilt,           sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
-       { bridge_ioctl_sfilt,           sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_purge, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_purge,   sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_addspan, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
+       { .bc_func = bridge_ioctl_delspan, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_addspan,         sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
-       { bridge_ioctl_delspan,         sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_gbparam64, .bc_argsize = sizeof(struct ifbropreq64),
+         .bc_flags = BC_F_COPYOUT },
 
 
-       { bridge_ioctl_gbparam64,       sizeof (struct ifbropreq64),
-           BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_grte, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYOUT },
 
 
-       { bridge_ioctl_grte,            sizeof (struct ifbrparam),
-           BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_gifsstp64, .bc_argsize = sizeof(struct ifbpstpconf64),     /* 30 */
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
 
 
-       { bridge_ioctl_gifsstp64,       sizeof (struct ifbpstpconf64),
-           BC_F_COPYIN|BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_sproto, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_sproto,          sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_stxhc, .bc_argsize = sizeof(struct ifbrparam),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_stxhc,           sizeof (struct ifbrparam),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_sifmaxaddr, .bc_argsize = sizeof(struct ifbreq),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 
 
-       { bridge_ioctl_sifmaxaddr,      sizeof (struct ifbreq),
-           BC_F_COPYIN|BC_F_SUSER },
+       { .bc_func = bridge_ioctl_ghostfilter, .bc_argsize = sizeof(struct ifbrhostfilter),
+         .bc_flags = BC_F_COPYIN | BC_F_COPYOUT },
+       { .bc_func = bridge_ioctl_shostfilter, .bc_argsize = sizeof(struct ifbrhostfilter),
+         .bc_flags = BC_F_COPYIN | BC_F_SUSER },
 };
 
 static const unsigned int bridge_control_table_size =
 };
 
 static const unsigned int bridge_control_table_size =
-    sizeof (bridge_control_table32) / sizeof (bridge_control_table32[0]);
+    sizeof(bridge_control_table32) / sizeof(bridge_control_table32[0]);
 
 static LIST_HEAD(, bridge_softc) bridge_list =
     LIST_HEAD_INITIALIZER(bridge_list);
 
 static LIST_HEAD(, bridge_softc) bridge_list =
     LIST_HEAD_INITIALIZER(bridge_list);
@@ -737,7 +857,13 @@ static LIST_HEAD(, bridge_softc) bridge_list =
 static lck_grp_t *bridge_lock_grp = NULL;
 static lck_attr_t *bridge_lock_attr = NULL;
 
 static lck_grp_t *bridge_lock_grp = NULL;
 static lck_attr_t *bridge_lock_attr = NULL;
 
-static if_clone_t bridge_cloner = NULL;
+#define BRIDGENAME      "bridge"
+#define BRIDGES_MAX     IF_MAXUNIT
+#define BRIDGE_ZONE_MAX_ELEM    MIN(IFNETS_MAX, BRIDGES_MAX)
+
+static struct if_clone bridge_cloner =
+    IF_CLONE_INITIALIZER(BRIDGENAME, bridge_clone_create, bridge_clone_destroy,
+    0, BRIDGES_MAX, BRIDGE_ZONE_MAX_ELEM, sizeof(struct bridge_softc));
 
 static int if_bridge_txstart = 0;
 SYSCTL_INT(_net_link_bridge, OID_AUTO, txstart, CTLFLAG_RW | CTLFLAG_LOCKED,
 
 static int if_bridge_txstart = 0;
 SYSCTL_INT(_net_link_bridge, OID_AUTO, txstart, CTLFLAG_RW | CTLFLAG_LOCKED,
@@ -748,11 +874,11 @@ static int if_bridge_debug = 0;
 SYSCTL_INT(_net_link_bridge, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_LOCKED,
     &if_bridge_debug, 0, "Bridge debug");
 
 SYSCTL_INT(_net_link_bridge, OID_AUTO, debug, CTLFLAG_RW | CTLFLAG_LOCKED,
     &if_bridge_debug, 0, "Bridge debug");
 
-static void printf_ether_header(struct ether_header *eh);
-static void printf_mbuf_data(mbuf_t m, size_t offset, size_t len);
-static void printf_mbuf_pkthdr(mbuf_t m, const char *prefix, const char *suffix);
-static void printf_mbuf(mbuf_t m, const char *prefix, const char *suffix);
-static void link_print(struct sockaddr_dl *dl_p);
+static void printf_ether_header(struct ether_header *);
+static void printf_mbuf_data(mbuf_t, size_t, size_t);
+static void printf_mbuf_pkthdr(mbuf_t, const char *, const char *);
+static void printf_mbuf(mbuf_t, const char *, const char *);
+static void link_print(struct bridge_softc * sc);
 
 static void bridge_lock(struct bridge_softc *);
 static void bridge_unlock(struct bridge_softc *);
 
 static void bridge_lock(struct bridge_softc *);
 static void bridge_unlock(struct bridge_softc *);
@@ -766,12 +892,12 @@ bridge_lock(struct bridge_softc *sc)
 {
        void *lr_saved = __builtin_return_address(0);
 
 {
        void *lr_saved = __builtin_return_address(0);
 
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       BRIDGE_LOCK_ASSERT_NOTHELD(sc);
 
 
-       lck_mtx_lock(sc->sc_mtx);
+       _BRIDGE_LOCK(sc);
 
        sc->lock_lr[sc->next_lock_lr] = lr_saved;
 
        sc->lock_lr[sc->next_lock_lr] = lr_saved;
-       sc->next_lock_lr = (sc->next_lock_lr+1) % SO_LCKDBG_MAX;
+       sc->next_lock_lr = (sc->next_lock_lr + 1) % SO_LCKDBG_MAX;
 }
 
 static void
 }
 
 static void
@@ -779,12 +905,12 @@ bridge_unlock(struct bridge_softc *sc)
 {
        void *lr_saved = __builtin_return_address(0);
 
 {
        void *lr_saved = __builtin_return_address(0);
 
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
 
        sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
-       sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
+       sc->next_unlock_lr = (sc->next_unlock_lr + 1) % SO_LCKDBG_MAX;
 
 
-       lck_mtx_unlock(sc->sc_mtx);
+       _BRIDGE_UNLOCK(sc);
 }
 
 static int
 }
 
 static int
@@ -793,18 +919,20 @@ bridge_lock2ref(struct bridge_softc *sc)
        int error = 0;
        void *lr_saved = __builtin_return_address(0);
 
        int error = 0;
        void *lr_saved = __builtin_return_address(0);
 
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
 
-       if (sc->sc_iflist_xcnt > 0)
+       if (sc->sc_iflist_xcnt > 0) {
                error = EBUSY;
                error = EBUSY;
-       else
+       } else {
                sc->sc_iflist_ref++;
                sc->sc_iflist_ref++;
+       }
 
        sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
 
        sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
-       sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
-       lck_mtx_unlock(sc->sc_mtx);
+       sc->next_unlock_lr = (sc->next_unlock_lr + 1) % SO_LCKDBG_MAX;
+
+       _BRIDGE_UNLOCK(sc);
 
 
-       return (error);
+       return error;
 }
 
 static void
 }
 
 static void
@@ -812,21 +940,22 @@ bridge_unref(struct bridge_softc *sc)
 {
        void *lr_saved = __builtin_return_address(0);
 
 {
        void *lr_saved = __builtin_return_address(0);
 
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       BRIDGE_LOCK_ASSERT_NOTHELD(sc);
 
 
-       lck_mtx_lock(sc->sc_mtx);
+       _BRIDGE_LOCK(sc);
        sc->lock_lr[sc->next_lock_lr] = lr_saved;
        sc->lock_lr[sc->next_lock_lr] = lr_saved;
-       sc->next_lock_lr = (sc->next_lock_lr+1) % SO_LCKDBG_MAX;
+       sc->next_lock_lr = (sc->next_lock_lr + 1) % SO_LCKDBG_MAX;
 
        sc->sc_iflist_ref--;
 
        sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
 
        sc->sc_iflist_ref--;
 
        sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
-       sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
+       sc->next_unlock_lr = (sc->next_unlock_lr + 1) % SO_LCKDBG_MAX;
        if ((sc->sc_iflist_xcnt > 0) && (sc->sc_iflist_ref == 0)) {
        if ((sc->sc_iflist_xcnt > 0) && (sc->sc_iflist_ref == 0)) {
-               lck_mtx_unlock(sc->sc_mtx);
+               _BRIDGE_UNLOCK(sc);
                wakeup(&sc->sc_cv);
                wakeup(&sc->sc_cv);
-       } else
-               lck_mtx_unlock(sc->sc_mtx);
+       } else {
+               _BRIDGE_UNLOCK(sc);
+       }
 }
 
 static void
 }
 
 static void
@@ -834,24 +963,24 @@ bridge_xlock(struct bridge_softc *sc)
 {
        void *lr_saved = __builtin_return_address(0);
 
 {
        void *lr_saved = __builtin_return_address(0);
 
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        sc->sc_iflist_xcnt++;
        while (sc->sc_iflist_ref > 0) {
                sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
 
        sc->sc_iflist_xcnt++;
        while (sc->sc_iflist_ref > 0) {
                sc->unlock_lr[sc->next_unlock_lr] = lr_saved;
-               sc->next_unlock_lr = (sc->next_unlock_lr+1) % SO_LCKDBG_MAX;
+               sc->next_unlock_lr = (sc->next_unlock_lr + 1) % SO_LCKDBG_MAX;
 
 
-               msleep(&sc->sc_cv, sc->sc_mtx, PZERO, "BRIDGE_XLOCK", NULL);
+               msleep(&sc->sc_cv, &sc->sc_mtx, PZERO, "BRIDGE_XLOCK", NULL);
 
                sc->lock_lr[sc->next_lock_lr] = lr_saved;
 
                sc->lock_lr[sc->next_lock_lr] = lr_saved;
-               sc->next_lock_lr = (sc->next_lock_lr+1) % SO_LCKDBG_MAX;
+               sc->next_lock_lr = (sc->next_lock_lr + 1) % SO_LCKDBG_MAX;
        }
 }
 
 static void
 bridge_xdrop(struct bridge_softc *sc)
 {
        }
 }
 
 static void
 bridge_xdrop(struct bridge_softc *sc)
 {
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        sc->sc_iflist_xcnt--;
 }
 
        sc->sc_iflist_xcnt--;
 }
@@ -859,53 +988,64 @@ bridge_xdrop(struct bridge_softc *sc)
 void
 printf_mbuf_pkthdr(mbuf_t m, const char *prefix, const char *suffix)
 {
 void
 printf_mbuf_pkthdr(mbuf_t m, const char *prefix, const char *suffix)
 {
-       if (m)
-               printf("%spktlen: %u rcvif: %p header: %p nextpkt: %p%s",
+       if (m) {
+               printf("%spktlen: %u rcvif: 0x%llx header: 0x%llx "
+                   "nextpkt: 0x%llx%s",
                    prefix ? prefix : "", (unsigned int)mbuf_pkthdr_len(m),
                    prefix ? prefix : "", (unsigned int)mbuf_pkthdr_len(m),
-                   mbuf_pkthdr_rcvif(m), mbuf_pkthdr_header(m),
-                   mbuf_nextpkt(m), suffix ? suffix : "");
-       else
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_pkthdr_rcvif(m)),
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_pkthdr_header(m)),
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_nextpkt(m)),
+                   suffix ? suffix : "");
+       } else {
                printf("%s<NULL>%s\n", prefix, suffix);
                printf("%s<NULL>%s\n", prefix, suffix);
+       }
 }
 
 void
 printf_mbuf(mbuf_t m, const char *prefix, const char *suffix)
 {
        if (m) {
 }
 
 void
 printf_mbuf(mbuf_t m, const char *prefix, const char *suffix)
 {
        if (m) {
-               printf("%s%p type: %u flags: 0x%x len: %u data: %p maxlen: %u "
-                   "datastart: %p next: %p%s", prefix ? prefix : "",
-                   m, mbuf_type(m), mbuf_flags(m), (unsigned int)mbuf_len(m),
-                   mbuf_data(m), (unsigned int)mbuf_maxlen(m),
-                   mbuf_datastart(m), mbuf_next(m),
+               printf("%s0x%llx type: %u flags: 0x%x len: %u data: 0x%llx "
+                   "maxlen: %u datastart: 0x%llx next: 0x%llx%s",
+                   prefix ? prefix : "", (uint64_t)VM_KERNEL_ADDRPERM(m),
+                   mbuf_type(m), mbuf_flags(m), (unsigned int)mbuf_len(m),
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_data(m)),
+                   (unsigned int)mbuf_maxlen(m),
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_datastart(m)),
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_next(m)),
                    !suffix || (mbuf_flags(m) & MBUF_PKTHDR) ? "" : suffix);
                    !suffix || (mbuf_flags(m) & MBUF_PKTHDR) ? "" : suffix);
-               if ((mbuf_flags(m) & MBUF_PKTHDR))
+               if ((mbuf_flags(m) & MBUF_PKTHDR)) {
                        printf_mbuf_pkthdr(m, " ", suffix);
                        printf_mbuf_pkthdr(m, " ", suffix);
-       } else
+               }
+       } else {
                printf("%s<NULL>%s\n", prefix, suffix);
                printf("%s<NULL>%s\n", prefix, suffix);
+       }
 }
 
 void
 printf_mbuf_data(mbuf_t m, size_t offset, size_t len)
 {
 }
 
 void
 printf_mbuf_data(mbuf_t m, size_t offset, size_t len)
 {
-       mbuf_t                  n;
-       size_t                  i, j;
-       size_t                  pktlen, mlen, maxlen;
-       unsigned char   *ptr;
+       mbuf_t                  n;
+       size_t                  i, j;
+       size_t                  pktlen, mlen, maxlen;
+       unsigned char   *ptr;
 
        pktlen = mbuf_pkthdr_len(m);
 
 
        pktlen = mbuf_pkthdr_len(m);
 
-       if (offset > pktlen)
+       if (offset > pktlen) {
                return;
                return;
+       }
 
 
-       maxlen = (pktlen - offset > len) ? len : pktlen;
+       maxlen = (pktlen - offset > len) ? len : pktlen - offset;
        n = m;
        mlen = mbuf_len(n);
        ptr = mbuf_data(n);
        for (i = 0, j = 0; i < maxlen; i++, j++) {
                if (j >= mlen) {
                        n = mbuf_next(n);
        n = m;
        mlen = mbuf_len(n);
        ptr = mbuf_data(n);
        for (i = 0, j = 0; i < maxlen; i++, j++) {
                if (j >= mlen) {
                        n = mbuf_next(n);
-                       if (n == 0)
+                       if (n == 0) {
                                break;
                                break;
+                       }
                        ptr = mbuf_data(n);
                        mlen = mbuf_len(n);
                        j = 0;
                        ptr = mbuf_data(n);
                        mlen = mbuf_len(n);
                        j = 0;
@@ -925,22 +1065,34 @@ printf_ether_header(struct ether_header *eh)
            eh->ether_shost[3], eh->ether_shost[4], eh->ether_shost[5],
            eh->ether_dhost[0], eh->ether_dhost[1], eh->ether_dhost[2],
            eh->ether_dhost[3], eh->ether_dhost[4], eh->ether_dhost[5],
            eh->ether_shost[3], eh->ether_shost[4], eh->ether_shost[5],
            eh->ether_dhost[0], eh->ether_dhost[1], eh->ether_dhost[2],
            eh->ether_dhost[3], eh->ether_dhost[4], eh->ether_dhost[5],
-           eh->ether_type);
+           ntohs(eh->ether_type));
 }
 
 static void
 }
 
 static void
-link_print(struct sockaddr_dl *dl_p)
+link_print(struct bridge_softc * sc)
 {
        int i;
 {
        int i;
+       uint32_t sdl_buffer[offsetof(struct sockaddr_dl, sdl_data) +
+       IFNAMSIZ + ETHER_ADDR_LEN];
+       struct sockaddr_dl *sdl = (struct sockaddr_dl *)sdl_buffer;
+
+       memset(sdl, 0, sizeof(sdl_buffer));
+       sdl->sdl_family = AF_LINK;
+       sdl->sdl_nlen = strlen(sc->sc_if_xname);
+       sdl->sdl_alen = ETHER_ADDR_LEN;
+       sdl->sdl_len = offsetof(struct sockaddr_dl, sdl_data);
+       memcpy(sdl->sdl_data, sc->sc_if_xname, sdl->sdl_nlen);
+       memcpy(LLADDR(sdl), sc->sc_defaddr, ETHER_ADDR_LEN);
 
 #if 1
        printf("sdl len %d index %d family %d type 0x%x nlen %d alen %d"
 
 #if 1
        printf("sdl len %d index %d family %d type 0x%x nlen %d alen %d"
-           " slen %d addr ", dl_p->sdl_len,
-           dl_p->sdl_index,  dl_p->sdl_family, dl_p->sdl_type,
-           dl_p->sdl_nlen, dl_p->sdl_alen, dl_p->sdl_slen);
+           " slen %d addr ", sdl->sdl_len, sdl->sdl_index,
+           sdl->sdl_family, sdl->sdl_type, sdl->sdl_nlen,
+           sdl->sdl_alen, sdl->sdl_slen);
 #endif
 #endif
-       for (i = 0; i < dl_p->sdl_alen; i++)
-        printf("%s%x", i ? ":" : "", (CONST_LLADDR(dl_p))[i]);
+       for (i = 0; i < sdl->sdl_alen; i++) {
+               printf("%s%x", i ? ":" : "", (CONST_LLADDR(sdl))[i]);
+       }
        printf("\n");
 }
 
        printf("\n");
 }
 
@@ -952,14 +1104,14 @@ link_print(struct sockaddr_dl *dl_p)
  *     Pseudo-device attach routine.
  */
 __private_extern__ int
  *     Pseudo-device attach routine.
  */
 __private_extern__ int
-bridgeattach(__unused int n)
+bridgeattach(int n)
 {
 {
+#pragma unused(n)
        int error;
        lck_grp_attr_t *lck_grp_attr = NULL;
        int error;
        lck_grp_attr_t *lck_grp_attr = NULL;
-       struct ifnet_clone_params ifnet_clone_params;
 
 
-       bridge_rtnode_pool = zinit(sizeof (struct bridge_rtnode),
-           1024 * sizeof (struct bridge_rtnode), 0, "bridge_rtnode");
+       bridge_rtnode_pool = zinit(sizeof(struct bridge_rtnode),
+           1024 * sizeof(struct bridge_rtnode), 0, "bridge_rtnode");
        zone_change(bridge_rtnode_pool, Z_CALLERACCT, FALSE);
 
        lck_grp_attr = lck_grp_attr_alloc_init();
        zone_change(bridge_rtnode_pool, Z_CALLERACCT, FALSE);
 
        lck_grp_attr = lck_grp_attr_alloc_init();
@@ -972,7 +1124,7 @@ bridgeattach(__unused int n)
        lck_attr_setdebug(bridge_lock_attr);
 #endif
 
        lck_attr_setdebug(bridge_lock_attr);
 #endif
 
-       lck_mtx_init(bridge_list_mtx, bridge_lock_grp, bridge_lock_attr);
+       lck_mtx_init(&bridge_list_mtx, bridge_lock_grp, bridge_lock_attr);
 
        /* can free the attributes once we've allocated the group lock */
        lck_grp_attr_free(lck_grp_attr);
 
        /* can free the attributes once we've allocated the group lock */
        lck_grp_attr_free(lck_grp_attr);
@@ -983,15 +1135,12 @@ bridgeattach(__unused int n)
        bstp_sys_init();
 #endif /* BRIDGESTP */
 
        bstp_sys_init();
 #endif /* BRIDGESTP */
 
-       ifnet_clone_params.ifc_name = "bridge";
-       ifnet_clone_params.ifc_create = bridge_clone_create;
-       ifnet_clone_params.ifc_destroy = bridge_clone_destroy;
-
-       error = ifnet_clone_attach(&ifnet_clone_params, &bridge_cloner);
-       if (error != 0)
+       error = if_clone_attach(&bridge_cloner);
+       if (error != 0) {
                printf("%s: ifnet_clone_attach failed %d\n", __func__, error);
                printf("%s: ifnet_clone_attach failed %d\n", __func__, error);
+       }
 
 
-       return (error);
+       return error;
 }
 
 #if defined(PFIL_HOOKS)
 }
 
 #if defined(PFIL_HOOKS)
@@ -1024,34 +1173,69 @@ sysctl_pfil_ipfw SYSCTL_HANDLER_ARGS
                }
        }
 
                }
        }
 
-       return (error);
+       return error;
 }
 
 }
 
-SYSCTL_PROC(_net_link_bridge, OID_AUTO, ipfw, CTLTYPE_INT|CTLFLAG_RW,
-           &pfil_ipfw, 0, &sysctl_pfil_ipfw, "I", "Layer2 filter with IPFW");
+SYSCTL_PROC(_net_link_bridge, OID_AUTO, ipfw, CTLTYPE_INT | CTLFLAG_RW,
+    &pfil_ipfw, 0, &sysctl_pfil_ipfw, "I", "Layer2 filter with IPFW");
 #endif /* PFIL_HOOKS */
 
 #endif /* PFIL_HOOKS */
 
+static errno_t
+bridge_ifnet_set_attrs(struct ifnet * ifp)
+{
+       errno_t         error;
+
+       error = ifnet_set_mtu(ifp, ETHERMTU);
+       if (error != 0) {
+               printf("%s: ifnet_set_mtu failed %d\n", __func__, error);
+               goto done;
+       }
+       error = ifnet_set_addrlen(ifp, ETHER_ADDR_LEN);
+       if (error != 0) {
+               printf("%s: ifnet_set_addrlen failed %d\n", __func__, error);
+               goto done;
+       }
+       error = ifnet_set_hdrlen(ifp, ETHER_HDR_LEN);
+       if (error != 0) {
+               printf("%s: ifnet_set_hdrlen failed %d\n", __func__, error);
+               goto done;
+       }
+       error = ifnet_set_flags(ifp,
+           IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST,
+           0xffff);
+
+       if (error != 0) {
+               printf("%s: ifnet_set_flags failed %d\n", __func__, error);
+               goto done;
+       }
+done:
+       return error;
+}
+
 /*
  * bridge_clone_create:
  *
  *     Create a new bridge instance.
  */
 static int
 /*
  * bridge_clone_create:
  *
  *     Create a new bridge instance.
  */
 static int
-bridge_clone_create(struct if_clone *ifc, uint32_t unit, __unused void *params)
+bridge_clone_create(struct if_clone *ifc, uint32_t unit, void *params)
 {
 {
+#pragma unused(params)
        struct ifnet *ifp = NULL;
        struct ifnet *ifp = NULL;
-       struct bridge_softc *sc;
-       u_char eaddr[6];
+       struct bridge_softc *sc = NULL;
+       struct bridge_softc *sc2 = NULL;
        struct ifnet_init_eparams init_params;
        errno_t error = 0;
        struct ifnet_init_eparams init_params;
        errno_t error = 0;
-       uint32_t sdl_buffer[offsetof(struct sockaddr_dl, sdl_data) +
-           IFNAMSIZ + ETHER_ADDR_LEN];
-       struct sockaddr_dl *sdl = (struct sockaddr_dl *)sdl_buffer;
+       uint8_t eth_hostid[ETHER_ADDR_LEN];
+       int fb, retry, has_hostid;
 
 
-       sc = _MALLOC(sizeof (*sc), M_DEVBUF, M_WAITOK);
-       memset(sc, 0, sizeof (*sc));
+       sc =  if_clone_softc_allocate(&bridge_cloner);
+       if (sc == NULL) {
+               error = ENOMEM;
+               goto done;
+       }
 
 
-       sc->sc_mtx = lck_mtx_alloc_init(bridge_lock_grp, bridge_lock_attr);
+       lck_mtx_init(&sc->sc_mtx, bridge_lock_grp, bridge_lock_attr);
        sc->sc_brtmax = BRIDGE_RTABLE_MAX;
        sc->sc_brttimeout = BRIDGE_RTABLE_TIMEOUT;
        sc->sc_filter_flags = IFBF_FILT_DEFAULT;
        sc->sc_brtmax = BRIDGE_RTABLE_MAX;
        sc->sc_brttimeout = BRIDGE_RTABLE_TIMEOUT;
        sc->sc_filter_flags = IFBF_FILT_DEFAULT;
@@ -1064,144 +1248,122 @@ bridge_clone_create(struct if_clone *ifc, uint32_t unit, __unused void *params)
        sc->sc_filter_flags &= ~IFBF_FILT_USEIPF;
 #endif
 
        sc->sc_filter_flags &= ~IFBF_FILT_USEIPF;
 #endif
 
+       TAILQ_INIT(&sc->sc_iflist);
+
+       /* use the interface name as the unique id for ifp recycle */
+       snprintf(sc->sc_if_xname, sizeof(sc->sc_if_xname), "%s%d",
+           ifc->ifc_name, unit);
+       bzero(&init_params, sizeof(init_params));
+       init_params.ver                 = IFNET_INIT_CURRENT_VERSION;
+       init_params.len                 = sizeof(init_params);
        /* Initialize our routing table. */
        error = bridge_rtable_init(sc);
        if (error != 0) {
        /* Initialize our routing table. */
        error = bridge_rtable_init(sc);
        if (error != 0) {
-               printf("%s: bridge_rtable_init failed %d\n", __func__, error);
+               printf("%s: bridge_rtable_init failed %d\n",
+                   __func__, error);
                goto done;
        }
                goto done;
        }
-
-       TAILQ_INIT(&sc->sc_iflist);
        TAILQ_INIT(&sc->sc_spanlist);
        TAILQ_INIT(&sc->sc_spanlist);
-
-       /* use the interface name as the unique id for ifp recycle */
-       snprintf(sc->sc_if_xname, sizeof (sc->sc_if_xname), "%s%d",
-             ifc->ifc_name, unit);
-       bzero(&init_params, sizeof (init_params));
-       init_params.ver                 = IFNET_INIT_CURRENT_VERSION;
-       init_params.len                 = sizeof (init_params);
        if (if_bridge_txstart) {
        if (if_bridge_txstart) {
-               init_params.start       = bridge_start;
+               init_params.start = bridge_start;
        } else {
        } else {
-               init_params.flags       = IFNET_INIT_LEGACY;
-               init_params.output      = bridge_output;
-       }
-       init_params.uniqueid            = sc->sc_if_xname;
-       init_params.uniqueid_len        = strlen(sc->sc_if_xname);
-       init_params.sndq_maxlen         = IFQ_MAXLEN;
-       init_params.name                = ifc->ifc_name;
-       init_params.unit                = unit;
-       init_params.family              = IFNET_FAMILY_ETHERNET;
-       init_params.type                = IFT_BRIDGE;
-       init_params.demux               = ether_demux;
-       init_params.add_proto           = ether_add_proto;
-       init_params.del_proto           = ether_del_proto;
-       init_params.check_multi         = ether_check_multi;
-       init_params.framer              = ether_frameout;
-       init_params.softc               = sc;
-       init_params.ioctl               = bridge_ioctl;
-       init_params.set_bpf_tap         = bridge_set_bpf_tap;
-       init_params.detach              = bridge_detach;
-       init_params.broadcast_addr      = etherbroadcastaddr;
-       init_params.broadcast_len       = ETHER_ADDR_LEN;
-       error = ifnet_allocate_extended(&init_params, &ifp);
-       if (error != 0) {
-               printf("%s: ifnet_allocate failed %d\n", __func__, error);
-               goto done;
+               init_params.flags = IFNET_INIT_LEGACY;
+               init_params.output = bridge_output;
        }
        }
-       sc->sc_ifp = ifp;
+       init_params.set_bpf_tap = bridge_set_bpf_tap;
+       init_params.uniqueid            = sc->sc_if_xname;
+       init_params.uniqueid_len        = strlen(sc->sc_if_xname);
+       init_params.sndq_maxlen         = IFQ_MAXLEN;
+       init_params.name                = ifc->ifc_name;
+       init_params.unit                = unit;
+       init_params.family              = IFNET_FAMILY_ETHERNET;
+       init_params.type                = IFT_BRIDGE;
+       init_params.demux               = ether_demux;
+       init_params.add_proto           = ether_add_proto;
+       init_params.del_proto           = ether_del_proto;
+       init_params.check_multi         = ether_check_multi;
+       init_params.framer_extended     = ether_frameout_extended;
+       init_params.softc               = sc;
+       init_params.ioctl               = bridge_ioctl;
+       init_params.detach              = bridge_detach;
+       init_params.broadcast_addr      = etherbroadcastaddr;
+       init_params.broadcast_len       = ETHER_ADDR_LEN;
 
 
-       error = ifnet_set_mtu(ifp, ETHERMTU);
-       if (error != 0) {
-               printf("%s: ifnet_set_mtu failed %d\n", __func__, error);
-               goto done;
-       }
-       error = ifnet_set_addrlen(ifp, ETHER_ADDR_LEN);
-       if (error != 0) {
-               printf("%s: ifnet_set_addrlen failed %d\n", __func__, error);
-               goto done;
-       }
-       error = ifnet_set_hdrlen(ifp, ETHER_HDR_LEN);
+       error = ifnet_allocate_extended(&init_params, &ifp);
        if (error != 0) {
        if (error != 0) {
-               printf("%s: ifnet_set_hdrlen failed %d\n", __func__, error);
+               printf("%s: ifnet_allocate failed %d\n",
+                   __func__, error);
                goto done;
        }
                goto done;
        }
-       error = ifnet_set_flags(ifp,
-           IFF_BROADCAST | IFF_SIMPLEX | IFF_NOTRAILERS | IFF_MULTICAST,
-           0xffff);
+       sc->sc_ifp = ifp;
+       error = bridge_ifnet_set_attrs(ifp);
        if (error != 0) {
        if (error != 0) {
-               printf("%s: ifnet_set_flags failed %d\n", __func__, error);
+               printf("%s: bridge_ifnet_set_attrs failed %d\n",
+                   __func__, error);
                goto done;
        }
                goto done;
        }
-
-#if 0
        /*
        /*
-        * Generate a random ethernet address with a locally administered
-        * address.
+        * Generate an ethernet address with a locally administered address.
         *
         * Since we are using random ethernet addresses for the bridge, it is
         * possible that we might have address collisions, so make sure that
         * this hardware address isn't already in use on another bridge.
         *
         * Since we are using random ethernet addresses for the bridge, it is
         * possible that we might have address collisions, so make sure that
         * this hardware address isn't already in use on another bridge.
+        * The first try uses the "hostid" and falls back to read_frandom();
+        * for "hostid", we use the MAC address of the first-encountered
+        * Ethernet-type interface that is currently configured.
         */
         */
-       {
-               int retry;
-
-               for (retry = 1; retry != 0;) {
-                       struct ifnet *bifp;
-                       struct bridge_softc *sc2;
-
-                       read_random(eaddr, ETHER_ADDR_LEN);
-                       eaddr[0] &= ~1;         /* clear multicast bit */
-                       eaddr[0] |= 2;          /* set the LAA bit */
-                       retry = 0;
-                       lck_mtx_lock(bridge_list_mtx);
-                       LIST_FOREACH(sc2, &bridge_list, sc_list) {
-                               bifp = sc2->sc_ifp;
-                               if (memcmp(eaddr, ifnet_lladdr(bifp),
-                                   ETHER_ADDR_LEN) == 0)
-                                       retry = 1;
-                       }
-                       lck_mtx_unlock(bridge_list_mtx);
+       fb = 0;
+       has_hostid = (uuid_get_ethernet(&eth_hostid[0]) == 0);
+       for (retry = 1; retry != 0;) {
+               if (fb || has_hostid == 0) {
+                       read_frandom(&sc->sc_defaddr, ETHER_ADDR_LEN);
+                       sc->sc_defaddr[0] &= ~1; /* clear multicast bit */
+                       sc->sc_defaddr[0] |= 2;  /* set the LAA bit */
+               } else {
+                       bcopy(&eth_hostid[0], &sc->sc_defaddr,
+                           ETHER_ADDR_LEN);
+                       sc->sc_defaddr[0] &= ~1; /* clear multicast bit */
+                       sc->sc_defaddr[0] |= 2;  /* set the LAA bit */
+                       sc->sc_defaddr[3] =     /* stir it up a bit */
+                           ((sc->sc_defaddr[3] & 0x0f) << 4) |
+                           ((sc->sc_defaddr[3] & 0xf0) >> 4);
+                       /*
+                        * Mix in the LSB as it's actually pretty significant,
+                        * see rdar://14076061
+                        */
+                       sc->sc_defaddr[4] =
+                           (((sc->sc_defaddr[4] & 0x0f) << 4) |
+                           ((sc->sc_defaddr[4] & 0xf0) >> 4)) ^
+                           sc->sc_defaddr[5];
+                       sc->sc_defaddr[5] = ifp->if_unit & 0xff;
                }
                }
-       }
-#else
-       /*
-        * Generate a random ethernet address and use the private AC:DE:48
-        * OUI code.
-        */
-       {
-               uint32_t r;
 
 
-               read_random(&r, sizeof (r));
-               eaddr[0] = 0xAC;
-               eaddr[1] = 0xDE;
-               eaddr[2] = 0x48;
-               eaddr[3] = (r >> 0)  & 0xffu;
-               eaddr[4] = (r >> 8)  & 0xffu;
-               eaddr[5] = (r >> 16) & 0xffu;
+               fb = 1;
+               retry = 0;
+               lck_mtx_lock(&bridge_list_mtx);
+               LIST_FOREACH(sc2, &bridge_list, sc_list) {
+                       if (memcmp(sc->sc_defaddr,
+                           IF_LLADDR(sc2->sc_ifp), ETHER_ADDR_LEN) == 0) {
+                               retry = 1;
+                       }
+               }
+               lck_mtx_unlock(&bridge_list_mtx);
        }
        }
-#endif
 
 
-       memset(sdl, 0, sizeof (sdl_buffer));
-       sdl->sdl_family = AF_LINK;
-       sdl->sdl_nlen = strlen(sc->sc_if_xname);
-       sdl->sdl_alen = ETHER_ADDR_LEN;
-       sdl->sdl_len = offsetof(struct sockaddr_dl, sdl_data);
-       memcpy(sdl->sdl_data, sc->sc_if_xname, sdl->sdl_nlen);
-       memcpy(LLADDR(sdl), eaddr, ETHER_ADDR_LEN);
+       sc->sc_flags &= ~SCF_MEDIA_ACTIVE;
 
 #if BRIDGE_DEBUG
 
 #if BRIDGE_DEBUG
-       if (if_bridge_debug)
-               link_print(sdl);
+       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+               link_print(sc);
+       }
 #endif
 #endif
-
        error = ifnet_attach(ifp, NULL);
        if (error != 0) {
                printf("%s: ifnet_attach failed %d\n", __func__, error);
                goto done;
        }
 
        error = ifnet_attach(ifp, NULL);
        if (error != 0) {
                printf("%s: ifnet_attach failed %d\n", __func__, error);
                goto done;
        }
 
-       error = ifnet_set_lladdr_and_type(ifp, eaddr, ETHER_ADDR_LEN,
+       error = ifnet_set_lladdr_and_type(ifp, sc->sc_defaddr, ETHER_ADDR_LEN,
            IFT_ETHER);
        if (error != 0) {
                printf("%s: ifnet_set_lladdr_and_type failed %d\n", __func__,
            IFT_ETHER);
        if (error != 0) {
                printf("%s: ifnet_set_lladdr_and_type failed %d\n", __func__,
@@ -1209,38 +1371,34 @@ bridge_clone_create(struct if_clone *ifc, uint32_t unit, __unused void *params)
                goto done;
        }
 
                goto done;
        }
 
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
-       /*
-        * APPLE MODIFICATION - our bridge can support HW checksums
-        * (useful if underlying interfaces support them) on TX,
-        * RX is not that interesting, since the stack just looks to
-        * see if the packet has been checksummed already (I think)
-        * but we might as well indicate we support it
-        */
-       ifp->if_capabilities =
-           IFCAP_CSUM_IPv4_Tx | IFCAP_CSUM_TCPv4_Tx | IFCAP_CSUM_UDPv4_Tx |
-           IFCAP_CSUM_IPv4_Rx | IFCAP_CSUM_TCPv4_Rx | IFCAP_CSUM_UDPv4_Rx;
-#endif
-
+       ifnet_set_offload(ifp,
+           IFNET_CSUM_IP | IFNET_CSUM_TCP | IFNET_CSUM_UDP |
+           IFNET_CSUM_TCPIPV6 | IFNET_CSUM_UDPIPV6 | IFNET_MULTIPAGES);
+       error = bridge_set_tso(sc);
+       if (error != 0) {
+               printf("%s: bridge_set_tso failed %d\n",
+                   __func__, error);
+               goto done;
+       }
 #if BRIDGESTP
        bstp_attach(&sc->sc_stp, &bridge_ops);
 #endif /* BRIDGESTP */
 
 #if BRIDGESTP
        bstp_attach(&sc->sc_stp, &bridge_ops);
 #endif /* BRIDGESTP */
 
-       lck_mtx_lock(bridge_list_mtx);
+       lck_mtx_lock(&bridge_list_mtx);
        LIST_INSERT_HEAD(&bridge_list, sc, sc_list);
        LIST_INSERT_HEAD(&bridge_list, sc, sc_list);
-       lck_mtx_unlock(bridge_list_mtx);
+       lck_mtx_unlock(&bridge_list_mtx);
 
        /* attach as ethernet */
 
        /* attach as ethernet */
-       error = bpf_attach(ifp, DLT_EN10MB, sizeof (struct ether_header),
+       error = bpf_attach(ifp, DLT_EN10MB, sizeof(struct ether_header),
            NULL, NULL);
 
 done:
        if (error != 0) {
                printf("%s failed error %d\n", __func__, error);
            NULL, NULL);
 
 done:
        if (error != 0) {
                printf("%s failed error %d\n", __func__, error);
-               /* Cleanup TBD */
+               /* TBD: Clean up: sc, sc_rthash etc */
        }
 
        }
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -1258,89 +1416,86 @@ bridge_clone_destroy(struct ifnet *ifp)
        BRIDGE_LOCK(sc);
        if ((sc->sc_flags & SCF_DETACHING)) {
                BRIDGE_UNLOCK(sc);
        BRIDGE_LOCK(sc);
        if ((sc->sc_flags & SCF_DETACHING)) {
                BRIDGE_UNLOCK(sc);
-               return (0);
+               return 0;
        }
        sc->sc_flags |= SCF_DETACHING;
 
        bridge_ifstop(ifp, 1);
 
        }
        sc->sc_flags |= SCF_DETACHING;
 
        bridge_ifstop(ifp, 1);
 
+       bridge_cancel_delayed_call(&sc->sc_resize_call);
+
+       bridge_cleanup_delayed_call(&sc->sc_resize_call);
+       bridge_cleanup_delayed_call(&sc->sc_aging_timer);
+
        error = ifnet_set_flags(ifp, 0, IFF_UP);
        if (error != 0) {
                printf("%s: ifnet_set_flags failed %d\n", __func__, error);
        }
 
        error = ifnet_set_flags(ifp, 0, IFF_UP);
        if (error != 0) {
                printf("%s: ifnet_set_flags failed %d\n", __func__, error);
        }
 
-       while ((bif = TAILQ_FIRST(&sc->sc_iflist)) != NULL)
+       while ((bif = TAILQ_FIRST(&sc->sc_iflist)) != NULL) {
                bridge_delete_member(sc, bif, 0);
                bridge_delete_member(sc, bif, 0);
+       }
 
        while ((bif = TAILQ_FIRST(&sc->sc_spanlist)) != NULL) {
                bridge_delete_span(sc, bif);
        }
 
        while ((bif = TAILQ_FIRST(&sc->sc_spanlist)) != NULL) {
                bridge_delete_span(sc, bif);
        }
-
        BRIDGE_UNLOCK(sc);
 
        error = ifnet_detach(ifp);
        if (error != 0) {
        BRIDGE_UNLOCK(sc);
 
        error = ifnet_detach(ifp);
        if (error != 0) {
-               panic("bridge_clone_destroy: ifnet_detach(%p) failed %d\n",
-                   ifp, error);
-               if ((sc = (struct bridge_softc *)ifnet_softc(ifp)) != NULL) {
-                       BRIDGE_LOCK(sc);
-                       sc->sc_flags &= ~SCF_DETACHING;
-                       BRIDGE_UNLOCK(sc);
-               }
-               return (0);
+               panic("%s: ifnet_detach(%p) failed %d\n",
+                   __func__, ifp, error);
        }
        }
-
-       return (0);
+       return 0;
 }
 
 #define DRVSPEC do { \
 }
 
 #define DRVSPEC do { \
-       if (ifd->ifd_cmd >= bridge_control_table_size) {                \
-               error = EINVAL;                                         \
-               break;                                                  \
-       }                                                               \
-       bc = &bridge_control_table[ifd->ifd_cmd];                       \
-                                                                       \
-       if (cmd == SIOCGDRVSPEC &&                                      \
-           (bc->bc_flags & BC_F_COPYOUT) == 0) {                       \
-               error = EINVAL;                                         \
-               break;                                                  \
-       } else if (cmd == SIOCSDRVSPEC &&                               \
-           (bc->bc_flags & BC_F_COPYOUT) != 0) {                       \
-               error = EINVAL;                                         \
-               break;                                                  \
-       }                                                               \
-                                                                       \
-       if (bc->bc_flags & BC_F_SUSER) {                                \
-               error = kauth_authorize_generic(kauth_cred_get(),       \
-                   KAUTH_GENERIC_ISSUSER);                             \
-               if (error)                                              \
-                       break;                                          \
-       }                                                               \
-                                                                       \
-       if (ifd->ifd_len != bc->bc_argsize ||                           \
-           ifd->ifd_len > sizeof (args)) {                             \
-               error = EINVAL;                                         \
-               break;                                                  \
-       }                                                               \
-                                                                       \
-       bzero(&args, sizeof (args));                                    \
-       if (bc->bc_flags & BC_F_COPYIN) {                               \
-               error = copyin(ifd->ifd_data, &args, ifd->ifd_len);     \
-               if (error)                                              \
-                       break;                                          \
-       }                                                               \
-                                                                       \
-       BRIDGE_LOCK(sc);                                                \
-       error = (*bc->bc_func)(sc, &args);                              \
-       BRIDGE_UNLOCK(sc);                                              \
-       if (error)                                                      \
-               break;                                                  \
-                                                                       \
-       if (bc->bc_flags & BC_F_COPYOUT)                                \
-               error = copyout(&args, ifd->ifd_data, ifd->ifd_len);    \
+       if (ifd->ifd_cmd >= bridge_control_table_size) {                \
+               error = EINVAL;                                         \
+               break;                                                  \
+       }                                                               \
+       bc = &bridge_control_table[ifd->ifd_cmd];                       \
+                                                                        \
+       if (cmd == SIOCGDRVSPEC &&                                      \
+           (bc->bc_flags & BC_F_COPYOUT) == 0) {                       \
+               error = EINVAL;                                         \
+               break;                                                  \
+       } else if (cmd == SIOCSDRVSPEC &&                               \
+           (bc->bc_flags & BC_F_COPYOUT) != 0) {                       \
+               error = EINVAL;                                         \
+               break;                                                  \
+       }                                                               \
+                                                                        \
+       if (bc->bc_flags & BC_F_SUSER) {                                \
+               error = kauth_authorize_generic(kauth_cred_get(),       \
+                   KAUTH_GENERIC_ISSUSER);                             \
+               if (error)                                              \
+                       break;                                          \
+       }                                                               \
+                                                                        \
+       if (ifd->ifd_len != bc->bc_argsize ||                           \
+           ifd->ifd_len > sizeof (args)) {                             \
+               error = EINVAL;                                         \
+               break;                                                  \
+       }                                                               \
+                                                                        \
+       bzero(&args, sizeof (args));                                    \
+       if (bc->bc_flags & BC_F_COPYIN) {                               \
+               error = copyin(ifd->ifd_data, &args, ifd->ifd_len);     \
+               if (error)                                              \
+                       break;                                          \
+       }                                                               \
+                                                                        \
+       BRIDGE_LOCK(sc);                                                \
+       error = (*bc->bc_func)(sc, &args);                              \
+       BRIDGE_UNLOCK(sc);                                              \
+       if (error)                                                      \
+               break;                                                  \
+                                                                        \
+       if (bc->bc_flags & BC_F_COPYOUT)                                \
+               error = copyout(&args, ifd->ifd_data, ifd->ifd_len);    \
 } while (0)
 
 } while (0)
 
-
 /*
  * bridge_ioctl:
  *
 /*
  * bridge_ioctl:
  *
@@ -1351,29 +1506,56 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
        struct bridge_softc *sc = ifp->if_softc;
        struct ifreq *ifr = (struct ifreq *)data;
 {
        struct bridge_softc *sc = ifp->if_softc;
        struct ifreq *ifr = (struct ifreq *)data;
+       struct bridge_iflist *bif;
        int error = 0;
 
        int error = 0;
 
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       BRIDGE_LOCK_ASSERT_NOTHELD(sc);
 
 #if BRIDGE_DEBUG
 
 #if BRIDGE_DEBUG
-       if (if_bridge_debug)
-               printf("%s: ifp %p cmd 0x%08lx (%c%c [%lu] %c %lu)\n",
-                   __func__, ifp, cmd, (cmd & IOC_IN) ? 'I' : ' ',
+       if (if_bridge_debug & BR_DBGF_IOCTL) {
+               printf("%s: ifp %s cmd 0x%08lx (%c%c [%lu] %c %lu)\n",
+                   __func__, ifp->if_xname, cmd, (cmd & IOC_IN) ? 'I' : ' ',
                    (cmd & IOC_OUT) ? 'O' : ' ', IOCPARM_LEN(cmd),
                    (char)IOCGROUP(cmd), cmd & 0xff);
                    (cmd & IOC_OUT) ? 'O' : ' ', IOCPARM_LEN(cmd),
                    (char)IOCGROUP(cmd), cmd & 0xff);
-#endif
+       }
+#endif /* BRIDGE_DEBUG */
 
        switch (cmd) {
 
        switch (cmd) {
-
        case SIOCSIFADDR:
        case SIOCAIFADDR:
                ifnet_set_flags(ifp, IFF_UP, IFF_UP);
                break;
 
        case SIOCGIFMEDIA32:
        case SIOCSIFADDR:
        case SIOCAIFADDR:
                ifnet_set_flags(ifp, IFF_UP, IFF_UP);
                break;
 
        case SIOCGIFMEDIA32:
-       case SIOCGIFMEDIA64:
-               error = EINVAL;
+       case SIOCGIFMEDIA64: {
+               struct ifmediareq *ifmr = (struct ifmediareq *)data;
+               user_addr_t user_addr;
+
+               user_addr = (cmd == SIOCGIFMEDIA64) ?
+                   ((struct ifmediareq64 *)ifmr)->ifmu_ulist :
+                   CAST_USER_ADDR_T(((struct ifmediareq32 *)ifmr)->ifmu_ulist);
+
+               ifmr->ifm_status = IFM_AVALID;
+               ifmr->ifm_mask = 0;
+               ifmr->ifm_count = 1;
+
+               BRIDGE_LOCK(sc);
+               if (!(sc->sc_flags & SCF_DETACHING) &&
+                   (sc->sc_flags & SCF_MEDIA_ACTIVE)) {
+                       ifmr->ifm_status |= IFM_ACTIVE;
+                       ifmr->ifm_active = ifmr->ifm_current =
+                           IFM_ETHER | IFM_AUTO;
+               } else {
+                       ifmr->ifm_active = ifmr->ifm_current = IFM_NONE;
+               }
+               BRIDGE_UNLOCK(sc);
+
+               if (user_addr != USER_ADDR_NULL) {
+                       error = copyout(&ifmr->ifm_current, user_addr,
+                           sizeof(int));
+               }
                break;
                break;
+       }
 
        case SIOCADDMULTI:
        case SIOCDELMULTI:
 
        case SIOCADDMULTI:
        case SIOCDELMULTI:
@@ -1441,32 +1623,57 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, void *data)
        case SIOCSIFLLADDR:
                error = ifnet_set_lladdr(ifp, ifr->ifr_addr.sa_data,
                    ifr->ifr_addr.sa_len);
        case SIOCSIFLLADDR:
                error = ifnet_set_lladdr(ifp, ifr->ifr_addr.sa_data,
                    ifr->ifr_addr.sa_len);
-               if (error != 0)
-                       printf("%s: ifnet_set_lladdr failed %d\n", __func__,
+               if (error != 0) {
+                       printf("%s: SIOCSIFLLADDR error %d\n", ifp->if_xname,
                            error);
                            error);
+               }
                break;
 
        case SIOCSIFMTU:
                break;
 
        case SIOCSIFMTU:
-               /* Do not allow the MTU to be changed on the bridge */
-               error = EINVAL;
+               if (ifr->ifr_mtu < 576) {
+                       error = EINVAL;
+                       break;
+               }
+               BRIDGE_LOCK(sc);
+               if (TAILQ_EMPTY(&sc->sc_iflist)) {
+                       sc->sc_ifp->if_mtu = ifr->ifr_mtu;
+                       BRIDGE_UNLOCK(sc);
+                       break;
+               }
+               TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+                       if (bif->bif_ifp->if_mtu != (unsigned)ifr->ifr_mtu) {
+                               printf("%s: invalid MTU: %u(%s) != %d\n",
+                                   sc->sc_ifp->if_xname,
+                                   bif->bif_ifp->if_mtu,
+                                   bif->bif_ifp->if_xname, ifr->ifr_mtu);
+                               error = EINVAL;
+                               break;
+                       }
+               }
+               if (!error) {
+                       sc->sc_ifp->if_mtu = ifr->ifr_mtu;
+               }
+               BRIDGE_UNLOCK(sc);
                break;
 
        default:
                error = ether_ioctl(ifp, cmd, data);
 #if BRIDGE_DEBUG
                break;
 
        default:
                error = ether_ioctl(ifp, cmd, data);
 #if BRIDGE_DEBUG
-               if (error != 0 && error != EOPNOTSUPP)
-                       printf("%s: ether_ioctl ifp %p cmd 0x%08lx "
+               if (error != 0 && error != EOPNOTSUPP) {
+                       printf("%s: ifp %s cmd 0x%08lx "
                            "(%c%c [%lu] %c %lu) failed error: %d\n",
                            "(%c%c [%lu] %c %lu) failed error: %d\n",
-                           __func__, ifp, cmd, (cmd & IOC_IN) ? 'I' : ' ',
+                           __func__, ifp->if_xname, cmd,
+                           (cmd & IOC_IN) ? 'I' : ' ',
                            (cmd & IOC_OUT) ? 'O' : ' ',
                            IOCPARM_LEN(cmd), (char)IOCGROUP(cmd),
                            cmd & 0xff, error);
                            (cmd & IOC_OUT) ? 'O' : ' ',
                            IOCPARM_LEN(cmd), (char)IOCGROUP(cmd),
                            cmd & 0xff, error);
+               }
 #endif /* BRIDGE_DEBUG */
                break;
        }
 #endif /* BRIDGE_DEBUG */
                break;
        }
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       BRIDGE_LOCK_ASSERT_NOTHELD(sc);
 
 
-       return (error);
+       return error;
 }
 
 #if HAS_IF_CAP
 }
 
 #if HAS_IF_CAP
@@ -1498,7 +1705,6 @@ bridge_mutecaps(struct bridge_softc *sc)
 
                bridge_set_ifcap(sc, bif, enabled);
        }
 
                bridge_set_ifcap(sc, bif, enabled);
        }
-
 }
 
 static void
 }
 
 static void
@@ -1508,21 +1714,123 @@ bridge_set_ifcap(struct bridge_softc *sc, struct bridge_iflist *bif, int set)
        struct ifreq ifr;
        int error;
 
        struct ifreq ifr;
        int error;
 
-       bzero(&ifr, sizeof (ifr));
+       bzero(&ifr, sizeof(ifr));
        ifr.ifr_reqcap = set;
 
        if (ifp->if_capenable != set) {
                IFF_LOCKGIANT(ifp);
                error = (*ifp->if_ioctl)(ifp, SIOCSIFCAP, (caddr_t)&ifr);
                IFF_UNLOCKGIANT(ifp);
        ifr.ifr_reqcap = set;
 
        if (ifp->if_capenable != set) {
                IFF_LOCKGIANT(ifp);
                error = (*ifp->if_ioctl)(ifp, SIOCSIFCAP, (caddr_t)&ifr);
                IFF_UNLOCKGIANT(ifp);
-               if (error)
-                       printf("%s: error setting interface capabilities "
-                           "on %s\n", __func__, ifnet_name(sc->sc_ifp),
-                           ifnet_unit(sc->sc_ifp), ifp->if_xname);
+               if (error) {
+                       printf("%s: %s error setting interface capabilities "
+                           "on %s\n", __func__, sc->sc_ifp->if_xname,
+                           ifp->if_xname);
+               }
        }
 }
 #endif /* HAS_IF_CAP */
 
        }
 }
 #endif /* HAS_IF_CAP */
 
+static errno_t
+bridge_set_tso(struct bridge_softc *sc)
+{
+       struct bridge_iflist *bif;
+       u_int32_t tso_v4_mtu;
+       u_int32_t tso_v6_mtu;
+       ifnet_offload_t offload;
+       errno_t error = 0;
+
+       /* By default, support TSO */
+       offload = sc->sc_ifp->if_hwassist | IFNET_TSO_IPV4 | IFNET_TSO_IPV6;
+       tso_v4_mtu = IP_MAXPACKET;
+       tso_v6_mtu = IP_MAXPACKET;
+
+       /* Use the lowest common denominator of the members */
+       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+               ifnet_t ifp = bif->bif_ifp;
+
+               if (ifp == NULL) {
+                       continue;
+               }
+
+               if (offload & IFNET_TSO_IPV4) {
+                       if (ifp->if_hwassist & IFNET_TSO_IPV4) {
+                               if (tso_v4_mtu > ifp->if_tso_v4_mtu) {
+                                       tso_v4_mtu = ifp->if_tso_v4_mtu;
+                               }
+                       } else {
+                               offload &= ~IFNET_TSO_IPV4;
+                               tso_v4_mtu = 0;
+                       }
+               }
+               if (offload & IFNET_TSO_IPV6) {
+                       if (ifp->if_hwassist & IFNET_TSO_IPV6) {
+                               if (tso_v6_mtu > ifp->if_tso_v6_mtu) {
+                                       tso_v6_mtu = ifp->if_tso_v6_mtu;
+                               }
+                       } else {
+                               offload &= ~IFNET_TSO_IPV6;
+                               tso_v6_mtu = 0;
+                       }
+               }
+       }
+
+       if (offload != sc->sc_ifp->if_hwassist) {
+               error = ifnet_set_offload(sc->sc_ifp, offload);
+               if (error != 0) {
+#if BRIDGE_DEBUG
+                       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+                               printf("%s: ifnet_set_offload(%s, 0x%x) "
+                                   "failed %d\n", __func__,
+                                   sc->sc_ifp->if_xname, offload, error);
+                       }
+#endif /* BRIDGE_DEBUG */
+                       goto done;
+               }
+               /*
+                * For ifnet_set_tso_mtu() sake, the TSO MTU must be at least
+                * as large as the interface MTU
+                */
+               if (sc->sc_ifp->if_hwassist & IFNET_TSO_IPV4) {
+                       if (tso_v4_mtu < sc->sc_ifp->if_mtu) {
+                               tso_v4_mtu = sc->sc_ifp->if_mtu;
+                       }
+                       error = ifnet_set_tso_mtu(sc->sc_ifp, AF_INET,
+                           tso_v4_mtu);
+                       if (error != 0) {
+#if BRIDGE_DEBUG
+                               if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+                                       printf("%s: ifnet_set_tso_mtu(%s, "
+                                           "AF_INET, %u) failed %d\n",
+                                           __func__, sc->sc_ifp->if_xname,
+                                           tso_v4_mtu, error);
+                               }
+#endif /* BRIDGE_DEBUG */
+                               goto done;
+                       }
+               }
+               if (sc->sc_ifp->if_hwassist & IFNET_TSO_IPV6) {
+                       if (tso_v6_mtu < sc->sc_ifp->if_mtu) {
+                               tso_v6_mtu = sc->sc_ifp->if_mtu;
+                       }
+                       error = ifnet_set_tso_mtu(sc->sc_ifp, AF_INET6,
+                           tso_v6_mtu);
+                       if (error != 0) {
+#if BRIDGE_DEBUG
+                               if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+                                       printf("%s: ifnet_set_tso_mtu(%s, "
+                                           "AF_INET6, %u) failed %d\n",
+                                           __func__, sc->sc_ifp->if_xname,
+                                           tso_v6_mtu, error);
+                               }
+#endif /* BRIDGE_DEBUG */
+                               goto done;
+                       }
+               }
+       }
+done:
+       return error;
+}
+
 /*
  * bridge_lookup_member:
  *
 /*
  * bridge_lookup_member:
  *
@@ -1533,19 +1841,17 @@ bridge_lookup_member(struct bridge_softc *sc, const char *name)
 {
        struct bridge_iflist *bif;
        struct ifnet *ifp;
 {
        struct bridge_iflist *bif;
        struct ifnet *ifp;
-       char if_xname[IFNAMSIZ];
 
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
                ifp = bif->bif_ifp;
 
        TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
                ifp = bif->bif_ifp;
-               snprintf(if_xname, sizeof (if_xname), "%s%d",
-                 ifnet_name(ifp), ifnet_unit(ifp));
-               if (strncmp(if_xname, name, sizeof (if_xname)) == 0)
-                       return (bif);
+               if (strcmp(ifp->if_xname, name) == 0) {
+                       return bif;
+               }
        }
 
        }
 
-       return (NULL);
+       return NULL;
 }
 
 /*
 }
 
 /*
@@ -1558,20 +1864,22 @@ bridge_lookup_member_if(struct bridge_softc *sc, struct ifnet *member_ifp)
 {
        struct bridge_iflist *bif;
 
 {
        struct bridge_iflist *bif;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
 
        TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
-               if (bif->bif_ifp == member_ifp)
-                       return (bif);
+               if (bif->bif_ifp == member_ifp) {
+                       return bif;
+               }
        }
 
        }
 
-       return (NULL);
+       return NULL;
 }
 
 static errno_t
 }
 
 static errno_t
-bridge_iff_input(void *cookie, ifnet_t ifp, __unused protocol_family_t protocol,
+bridge_iff_input(void *cookie, ifnet_t ifp, protocol_family_t protocol,
     mbuf_t *data, char **frame_ptr)
 {
     mbuf_t *data, char **frame_ptr)
 {
+#pragma unused(protocol)
        errno_t error = 0;
        struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
        struct bridge_softc *sc = bif->bif_sc;
        errno_t error = 0;
        struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
        struct bridge_softc *sc = bif->bif_sc;
@@ -1579,8 +1887,9 @@ bridge_iff_input(void *cookie, ifnet_t ifp, __unused protocol_family_t protocol,
        size_t frmlen = 0;
        mbuf_t m = *data;
 
        size_t frmlen = 0;
        mbuf_t m = *data;
 
-       if ((m->m_flags & M_PROTO1))
+       if ((m->m_flags & M_PROTO1)) {
                goto out;
                goto out;
+       }
 
        if (*frame_ptr >= (char *)mbuf_datastart(m) &&
            *frame_ptr <= (char *)mbuf_data(m)) {
 
        if (*frame_ptr >= (char *)mbuf_datastart(m) &&
            *frame_ptr <= (char *)mbuf_data(m)) {
@@ -1588,14 +1897,15 @@ bridge_iff_input(void *cookie, ifnet_t ifp, __unused protocol_family_t protocol,
                frmlen = (char *)mbuf_data(m) - *frame_ptr;
        }
 #if BRIDGE_DEBUG
                frmlen = (char *)mbuf_data(m) - *frame_ptr;
        }
 #if BRIDGE_DEBUG
-       if (if_bridge_debug) {
-               printf("%s: %s%d from %s%d m %p data %p frame %p %s "
-                   "frmlen %lu\n", __func__, ifnet_name(sc->sc_ifp),
-                   ifnet_unit(sc->sc_ifp), ifnet_name(ifp), ifnet_unit(ifp),
-                   m, mbuf_data(m), *frame_ptr,
+       if (if_bridge_debug & BR_DBGF_INPUT) {
+               printf("%s: %s from %s m 0x%llx data 0x%llx frame 0x%llx %s "
+                   "frmlen %lu\n", __func__, sc->sc_ifp->if_xname,
+                   ifp->if_xname, (uint64_t)VM_KERNEL_ADDRPERM(m),
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_data(m)),
+                   (uint64_t)VM_KERNEL_ADDRPERM(*frame_ptr),
                    included ? "inside" : "outside", frmlen);
 
                    included ? "inside" : "outside", frmlen);
 
-               if (if_bridge_debug > 1) {
+               if (if_bridge_debug & BR_DBGF_MBUF) {
                        printf_mbuf(m, "bridge_iff_input[", "\n");
                        printf_ether_header((struct ether_header *)
                            (void *)*frame_ptr);
                        printf_mbuf(m, "bridge_iff_input[", "\n");
                        printf_ether_header((struct ether_header *)
                            (void *)*frame_ptr);
@@ -1624,96 +1934,117 @@ bridge_iff_input(void *cookie, ifnet_t ifp, __unused protocol_family_t protocol,
                (void) mbuf_pkthdr_adjustlen(m, -frmlen);
        }
 #if BRIDGE_DEBUG
                (void) mbuf_pkthdr_adjustlen(m, -frmlen);
        }
 #if BRIDGE_DEBUG
-       if (if_bridge_debug > 1) {
+       if ((if_bridge_debug & BR_DBGF_INPUT) &&
+           (if_bridge_debug & BR_DBGF_MBUF)) {
                printf("\n");
                printf_mbuf(m, "bridge_iff_input]", "\n");
        }
 #endif /* BRIDGE_DEBUG */
 
 out:
                printf("\n");
                printf_mbuf(m, "bridge_iff_input]", "\n");
        }
 #endif /* BRIDGE_DEBUG */
 
 out:
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       BRIDGE_LOCK_ASSERT_NOTHELD(sc);
 
 
-       return (error);
+       return error;
 }
 
 }
 
-
-#if BRIDGE_MEMBER_OUT_FILTER
 static errno_t
 static errno_t
-bridge_iff_output(void *cookie, ifnet_t ifp, __unused protocol_family_t protocol, mbuf_t *data)
+bridge_iff_output(void *cookie, ifnet_t ifp, protocol_family_t protocol,
+    mbuf_t *data)
 {
 {
+#pragma unused(protocol)
        errno_t error = 0;
        struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
        struct bridge_softc *sc = bif->bif_sc;
        mbuf_t m = *data;
 
        errno_t error = 0;
        struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
        struct bridge_softc *sc = bif->bif_sc;
        mbuf_t m = *data;
 
-       if ((m->m_flags & M_PROTO1))
+       if ((m->m_flags & M_PROTO1)) {
                goto out;
                goto out;
+       }
 
 #if BRIDGE_DEBUG
 
 #if BRIDGE_DEBUG
-       if (if_bridge_debug) {
-               printf("%s: %s%d from %s%d m %p data %p\n", __func__,
-                   ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
-                   ifnet_name(ifp), ifnet_unit(ifp), m, mbuf_data(m));
+       if (if_bridge_debug & BR_DBGF_OUTPUT) {
+               printf("%s: %s from %s m 0x%llx data 0x%llx\n", __func__,
+                   sc->sc_ifp->if_xname, ifp->if_xname,
+                   (uint64_t)VM_KERNEL_ADDRPERM(m),
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_data(m)));
        }
 #endif /* BRIDGE_DEBUG */
 
        error = bridge_member_output(sc, ifp, m);
        }
 #endif /* BRIDGE_DEBUG */
 
        error = bridge_member_output(sc, ifp, m);
-       if (error != 0) {
+       if (error != 0 && error != EJUSTRETURN) {
                printf("%s: bridge_member_output failed error %d\n", __func__,
                    error);
        }
                printf("%s: bridge_member_output failed error %d\n", __func__,
                    error);
        }
-
 out:
 out:
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_NOTOWNED);
+       BRIDGE_LOCK_ASSERT_NOTHELD(sc);
 
 
-       return (error);
+       return error;
 }
 }
-#endif /* BRIDGE_MEMBER_OUT_FILTER */
-
 
 static void
 
 static void
-bridge_iff_event(void *cookie, ifnet_t ifp, __unused protocol_family_t protocol,
+bridge_iff_event(void *cookie, ifnet_t ifp, protocol_family_t protocol,
     const struct kev_msg *event_msg)
 {
     const struct kev_msg *event_msg)
 {
+#pragma unused(protocol)
        struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
        struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
+       struct bridge_softc *sc = bif->bif_sc;
 
        if (event_msg->vendor_code == KEV_VENDOR_APPLE &&
 
        if (event_msg->vendor_code == KEV_VENDOR_APPLE &&
-               event_msg->kev_class == KEV_NETWORK_CLASS &&
-               event_msg->kev_subclass == KEV_DL_SUBCLASS) {
-               switch (event_msg->event_code) {
-                       case KEV_DL_IF_DETACHING:
-                       case KEV_DL_IF_DETACHED:
-                               bridge_ifdetach(bif, ifp);
-                               break;
+           event_msg->kev_class == KEV_NETWORK_CLASS &&
+           event_msg->kev_subclass == KEV_DL_SUBCLASS) {
+#if BRIDGE_DEBUG
+               if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+                       printf("%s: %s event_code %u - %s\n", __func__,
+                           ifp->if_xname, event_msg->event_code,
+                           dlil_kev_dl_code_str(event_msg->event_code));
+               }
+#endif /* BRIDGE_DEBUG */
 
 
-                       case KEV_DL_LINK_OFF:
-                       case KEV_DL_LINK_ON: {
-#if BRIDGESTP
-                               bstp_linkstate(ifp, event_msg->event_code);
+               switch (event_msg->event_code) {
+               case KEV_DL_IF_DETACHING:
+               case KEV_DL_IF_DETACHED: {
+                       bridge_ifdetach(ifp);
+                       break;
+               }
+               case KEV_DL_LINK_OFF:
+               case KEV_DL_LINK_ON: {
+                       bridge_iflinkevent(ifp);
+#if BRIDGESTP
+                       bstp_linkstate(ifp, event_msg->event_code);
 #endif /* BRIDGESTP */
 #endif /* BRIDGESTP */
-                               break;
-                       }
-
-                       case KEV_DL_SIFFLAGS: {
-                               if (bif->bif_promisc == 0 &&
-                                   (ifp->if_flags & IFF_UP)) {
-                                       errno_t error =
-                                           ifnet_set_promiscuous(ifp, 1);
-                                       if (error != 0) {
-                                               printf("%s: "
-                                                   "ifnet_set_promiscuous"
-                                                   "(%s%d) failed %d\n",
-                                                   __func__, ifnet_name(ifp),
-                                                   ifnet_unit(ifp), error);
-                                       } else {
-                                               bif->bif_promisc = 1;
-                                       }
+                       break;
+               }
+               case KEV_DL_SIFFLAGS: {
+                       if ((bif->bif_flags & BIFF_PROMISC) == 0 &&
+                           (ifp->if_flags & IFF_UP)) {
+                               errno_t error;
+
+                               error = ifnet_set_promiscuous(ifp, 1);
+                               if (error != 0) {
+                                       printf("%s: "
+                                           "ifnet_set_promiscuous (%s)"
+                                           " failed %d\n",
+                                           __func__, ifp->if_xname,
+                                           error);
+                               } else {
+                                       bif->bif_flags |= BIFF_PROMISC;
                                }
                                }
-                               break;
                        }
                        }
-
-                       default:
-                               break;
+                       break;
+               }
+               case KEV_DL_IFCAP_CHANGED: {
+                       BRIDGE_LOCK(sc);
+                       bridge_set_tso(sc);
+                       BRIDGE_UNLOCK(sc);
+                       break;
+               }
+               case KEV_DL_PROTO_DETACHED:
+               case KEV_DL_PROTO_ATTACHED: {
+                       bridge_proto_attach_changed(ifp);
+                       break;
+               }
+               default:
+                       break;
                }
        }
 }
                }
        }
 }
@@ -1725,60 +2056,74 @@ bridge_iff_event(void *cookie, ifnet_t ifp, __unused protocol_family_t protocol,
  *     interface is detaching.
  */
 static void
  *     interface is detaching.
  */
 static void
-bridge_iff_detached(void *cookie, __unused ifnet_t ifp)
+bridge_iff_detached(void *cookie, ifnet_t ifp)
 {
        struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
 
 #if BRIDGE_DEBUG
 {
        struct bridge_iflist *bif = (struct bridge_iflist *)cookie;
 
 #if BRIDGE_DEBUG
-       printf("%s: %s%d\n", __func__, ifnet_name(ifp), ifnet_unit(ifp));
-#endif
+       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+               printf("%s: %s\n", __func__, ifp->if_xname);
+       }
+#endif /* BRIDGE_DEBUG */
 
 
-       bridge_ifdetach(bif, ifp);
+       bridge_ifdetach(ifp);
 
        _FREE(bif, M_DEVBUF);
 }
 
 static errno_t
 
        _FREE(bif, M_DEVBUF);
 }
 
 static errno_t
-bridge_proto_input(ifnet_t ifp, __unused protocol_family_t protocol,
-    __unused mbuf_t packet, __unused char *header)
+bridge_proto_input(ifnet_t ifp, protocol_family_t protocol, mbuf_t packet,
+    char *header)
 {
 {
-       printf("%s: unexpected packet from %s%d\n", __func__,
-           ifnet_name(ifp), ifnet_unit(ifp));
-       return (0);
+#pragma unused(protocol, packet, header)
+#if BRIDGE_DEBUG
+       printf("%s: unexpected packet from %s\n", __func__,
+           ifp->if_xname);
+#endif /* BRIDGE_DEBUG */
+       return 0;
 }
 
 static int
 bridge_attach_protocol(struct ifnet *ifp)
 {
 }
 
 static int
 bridge_attach_protocol(struct ifnet *ifp)
 {
-       int     error;
-       struct ifnet_attach_proto_param reg;
+       int     error;
+       struct ifnet_attach_proto_param reg;
 
 
-       printf("%s: %s%d\n", __func__, ifnet_name(ifp), ifnet_unit(ifp));
+#if BRIDGE_DEBUG
+       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+               printf("%s: %s\n", __func__, ifp->if_xname);
+       }
+#endif /* BRIDGE_DEBUG */
 
 
-       bzero(&reg, sizeof (reg));
+       bzero(&reg, sizeof(reg));
        reg.input = bridge_proto_input;
 
        error = ifnet_attach_protocol(ifp, PF_BRIDGE, &reg);
        reg.input = bridge_proto_input;
 
        error = ifnet_attach_protocol(ifp, PF_BRIDGE, &reg);
-       if (error)
-               printf("%s: ifnet_attach_protocol(%s%d) failed, %d\n",
-                   __func__, ifnet_name(ifp), ifnet_unit(ifp), error);
+       if (error) {
+               printf("%s: ifnet_attach_protocol(%s) failed, %d\n",
+                   __func__, ifp->if_xname, error);
+       }
 
 
-       return (error);
+       return error;
 }
 
 static int
 bridge_detach_protocol(struct ifnet *ifp)
 {
 }
 
 static int
 bridge_detach_protocol(struct ifnet *ifp)
 {
-       int         error;
-
-       printf("%s: %s%d\n", __func__, ifnet_name(ifp), ifnet_unit(ifp));
+       int     error;
 
 
+#if BRIDGE_DEBUG
+       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+               printf("%s: %s\n", __func__, ifp->if_xname);
+       }
+#endif /* BRIDGE_DEBUG */
        error = ifnet_detach_protocol(ifp, PF_BRIDGE);
        error = ifnet_detach_protocol(ifp, PF_BRIDGE);
-       if (error)
-               printf("%s: ifnet_detach_protocol(%s%d) failed, %d\n",
-                   __func__, ifnet_name(ifp), ifnet_unit(ifp), error);
+       if (error) {
+               printf("%s: ifnet_detach_protocol(%s) failed, %d\n",
+                   __func__, ifp->if_xname, error);
+       }
 
 
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -1790,9 +2135,21 @@ static void
 bridge_delete_member(struct bridge_softc *sc, struct bridge_iflist *bif,
     int gone)
 {
 bridge_delete_member(struct bridge_softc *sc, struct bridge_iflist *bif,
     int gone)
 {
-       struct ifnet *ifs = bif->bif_ifp;
+       struct ifnet *ifs = bif->bif_ifp, *bifp = sc->sc_ifp;
+       int lladdr_changed = 0, error, filt_attached;
+       uint8_t eaddr[ETHER_ADDR_LEN];
+       u_int32_t event_code = 0;
+
+       BRIDGE_LOCK_ASSERT_HELD(sc);
+       VERIFY(ifs != NULL);
 
 
-       BRIDGE_LOCK_ASSERT(sc);
+       /*
+        * First, remove the member from the list first so it cannot be found anymore
+        * when we release the bridge lock below
+        */
+       BRIDGE_XLOCK(sc);
+       TAILQ_REMOVE(&sc->sc_iflist, bif, bif_next);
+       BRIDGE_XDROP(sc);
 
        if (!gone) {
                switch (ifs->if_type) {
 
        if (!gone) {
                switch (ifs->if_type) {
@@ -1801,18 +2158,23 @@ bridge_delete_member(struct bridge_softc *sc, struct bridge_iflist *bif,
                        /*
                         * Take the interface out of promiscuous mode.
                         */
                        /*
                         * Take the interface out of promiscuous mode.
                         */
-                       if (bif->bif_promisc)
+                       if (bif->bif_flags & BIFF_PROMISC) {
+                               /*
+                                * Unlock to prevent deadlock with bridge_iff_event() in
+                                * case the driver generates an interface event
+                                */
+                               BRIDGE_UNLOCK(sc);
                                (void) ifnet_set_promiscuous(ifs, 0);
                                (void) ifnet_set_promiscuous(ifs, 0);
+                               BRIDGE_LOCK(sc);
+                       }
                        break;
 
                case IFT_GIF:
                        break;
 
                case IFT_GIF:
-                       break;
-
+               /* currently not supported */
+               /* FALLTHRU */
                default:
                default:
-#ifdef DIAGNOSTIC
-                       panic("bridge_delete_member: impossible");
-#endif
-                       break;
+                       VERIFY(0);
+                       /* NOTREACHED */
                }
 
 #if HAS_IF_CAP
                }
 
 #if HAS_IF_CAP
@@ -1821,45 +2183,85 @@ bridge_delete_member(struct bridge_softc *sc, struct bridge_iflist *bif,
 #endif
        }
 
 #endif
        }
 
-       if (bif->bif_proto_attached) {
+       if (bif->bif_flags & BIFF_PROTO_ATTACHED) {
                /* Respect lock ordering with DLIL lock */
                BRIDGE_UNLOCK(sc);
                (void) bridge_detach_protocol(ifs);
                BRIDGE_LOCK(sc);
        }
 #if BRIDGESTP
                /* Respect lock ordering with DLIL lock */
                BRIDGE_UNLOCK(sc);
                (void) bridge_detach_protocol(ifs);
                BRIDGE_LOCK(sc);
        }
 #if BRIDGESTP
-       if (bif->bif_flags & IFBIF_STP)
+       if ((bif->bif_ifflags & IFBIF_STP) != 0) {
                bstp_disable(&bif->bif_stp);
                bstp_disable(&bif->bif_stp);
+       }
 #endif /* BRIDGESTP */
 
 #endif /* BRIDGESTP */
 
-       ifs->if_bridge = NULL;
-       BRIDGE_XLOCK(sc);
-       TAILQ_REMOVE(&sc->sc_iflist, bif, bif_next);
-       BRIDGE_XDROP(sc);
-
-       ifnet_release(ifs);
+       /*
+        * If removing the interface that gave the bridge its mac address, set
+        * the mac address of the bridge to the address of the next member, or
+        * to its default address if no members are left.
+        */
+       if (bridge_inherit_mac && sc->sc_ifaddr == ifs) {
+               ifnet_release(sc->sc_ifaddr);
+               if (TAILQ_EMPTY(&sc->sc_iflist)) {
+                       bcopy(sc->sc_defaddr, eaddr, ETHER_ADDR_LEN);
+                       sc->sc_ifaddr = NULL;
+               } else {
+                       struct ifnet *fif =
+                           TAILQ_FIRST(&sc->sc_iflist)->bif_ifp;
+                       bcopy(IF_LLADDR(fif), eaddr, ETHER_ADDR_LEN);
+                       sc->sc_ifaddr = fif;
+                       ifnet_reference(fif);   /* for sc_ifaddr */
+               }
+               lladdr_changed = 1;
+       }
 
 #if HAS_IF_CAP
 
 #if HAS_IF_CAP
-       bridge_mutecaps(sc);    /* recalcuate now this interface is removed */
+       bridge_mutecaps(sc);    /* recalculate now this interface is removed */
 #endif /* HAS_IF_CAP */
 #endif /* HAS_IF_CAP */
+
+       error = bridge_set_tso(sc);
+       if (error != 0) {
+               printf("%s: bridge_set_tso failed %d\n", __func__, error);
+       }
+
        bridge_rtdelete(sc, ifs, IFBF_FLUSHALL);
        bridge_rtdelete(sc, ifs, IFBF_FLUSHALL);
+
        KASSERT(bif->bif_addrcnt == 0,
            ("%s: %d bridge routes referenced", __func__, bif->bif_addrcnt));
 
        KASSERT(bif->bif_addrcnt == 0,
            ("%s: %d bridge routes referenced", __func__, bif->bif_addrcnt));
 
-#if BRIDGESTP
+       filt_attached = bif->bif_flags & BIFF_FILTER_ATTACHED;
+
+       /*
+        * Update link status of the bridge based on its remaining members
+        */
+       event_code = bridge_updatelinkstatus(sc);
+
        BRIDGE_UNLOCK(sc);
        BRIDGE_UNLOCK(sc);
-       bstp_destroy(&bif->bif_stp);    /* prepare to free */
-       BRIDGE_LOCK(sc);
+
+
+       if (lladdr_changed &&
+           (error = ifnet_set_lladdr(bifp, eaddr, ETHER_ADDR_LEN)) != 0) {
+               printf("%s: ifnet_set_lladdr failed %d\n", __func__, error);
+       }
+
+       if (event_code != 0) {
+               bridge_link_event(bifp, event_code);
+       }
+
+#if BRIDGESTP
+       bstp_destroy(&bif->bif_stp);    /* prepare to free */
 #endif /* BRIDGESTP */
 
 #endif /* BRIDGESTP */
 
-       if (bif->bif_filter_attached) {
-               /* Respect lock ordering with DLIL lock */
-               BRIDGE_UNLOCK(sc);
+       if (filt_attached) {
                iflt_detach(bif->bif_iff_ref);
                iflt_detach(bif->bif_iff_ref);
-               BRIDGE_LOCK(sc);
        } else {
                _FREE(bif, M_DEVBUF);
        }
        } else {
                _FREE(bif, M_DEVBUF);
        }
+
+       ifs->if_bridge = NULL;
+       ifnet_release(ifs);
+
+       BRIDGE_LOCK(sc);
 }
 
 /*
 }
 
 /*
@@ -1870,7 +2272,7 @@ bridge_delete_member(struct bridge_softc *sc, struct bridge_iflist *bif,
 static void
 bridge_delete_span(struct bridge_softc *sc, struct bridge_iflist *bif)
 {
 static void
 bridge_delete_span(struct bridge_softc *sc, struct bridge_iflist *bif)
 {
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        KASSERT(bif->bif_ifp->if_bridge == NULL,
            ("%s: not a span interface", __func__));
 
        KASSERT(bif->bif_ifp->if_bridge == NULL,
            ("%s: not a span interface", __func__));
@@ -1886,56 +2288,91 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg)
 {
        struct ifbreq *req = arg;
        struct bridge_iflist *bif = NULL;
 {
        struct ifbreq *req = arg;
        struct bridge_iflist *bif = NULL;
-       struct ifnet *ifs;
-       int error = 0;
+       struct ifnet *ifs, *bifp = sc->sc_ifp;
+       int error = 0, lladdr_changed = 0;
+       uint8_t eaddr[ETHER_ADDR_LEN];
        struct iff_filter iff;
        struct iff_filter iff;
+       u_int32_t event_code = 0;
 
        ifs = ifunit(req->ifbr_ifsname);
 
        ifs = ifunit(req->ifbr_ifsname);
-       if (ifs == NULL)
-               return (ENOENT);
-       if (ifs->if_ioctl == NULL)      /* must be supported */
-               return (EINVAL);
+       if (ifs == NULL) {
+               return ENOENT;
+       }
+       if (ifs->if_ioctl == NULL) {    /* must be supported */
+               return EINVAL;
+       }
+
+       if (IFNET_IS_INTCOPROC(ifs)) {
+               return EINVAL;
+       }
 
        /* If it's in the span list, it can't be a member. */
        TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
 
        /* If it's in the span list, it can't be a member. */
        TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
-               if (ifs == bif->bif_ifp)
-                       return (EBUSY);
+       if (ifs == bif->bif_ifp) {
+               return EBUSY;
+       }
 
 
-       /* Allow the first Ethernet member to define the MTU */
-       if (ifs->if_type != IFT_GIF) {
-               if (TAILQ_EMPTY(&sc->sc_iflist))
-                       sc->sc_ifp->if_mtu = ifs->if_mtu;
-               else if (sc->sc_ifp->if_mtu != ifs->if_mtu) {
-                       printf("%s: %s%d: invalid MTU for %s%d", __func__,
-                           ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
-                           ifnet_name(ifs), ifnet_unit(ifs));
-                       return (EINVAL);
-               }
+       if (ifs->if_bridge == sc) {
+               return EEXIST;
        }
 
        }
 
-       if (ifs->if_bridge == sc)
-               return (EEXIST);
+       if (ifs->if_bridge != NULL) {
+               return EBUSY;
+       }
 
 
-       if (ifs->if_bridge != NULL)
-               return (EBUSY);
+       switch (ifs->if_type) {
+       case IFT_ETHER:
+       case IFT_L2VLAN:
+               /* permitted interface types */
+               break;
+       case IFT_GIF:
+       /* currently not supported */
+       /* FALLTHRU */
+       default:
+               return EINVAL;
+       }
 
 
-       bif = _MALLOC(sizeof (*bif), M_DEVBUF, M_NOWAIT|M_ZERO);
-       if (bif == NULL)
-               return (ENOMEM);
+       bif = _MALLOC(sizeof(*bif), M_DEVBUF, M_WAITOK | M_ZERO);
+       if (bif == NULL) {
+               return ENOMEM;
+       }
 
        bif->bif_ifp = ifs;
 
        bif->bif_ifp = ifs;
-       bif->bif_flags = IFBIF_LEARNING | IFBIF_DISCOVER;
+       ifnet_reference(ifs);
+       bif->bif_ifflags = IFBIF_LEARNING | IFBIF_DISCOVER;
 #if HAS_IF_CAP
        bif->bif_savedcaps = ifs->if_capenable;
 #endif /* HAS_IF_CAP */
        bif->bif_sc = sc;
 
 #if HAS_IF_CAP
        bif->bif_savedcaps = ifs->if_capenable;
 #endif /* HAS_IF_CAP */
        bif->bif_sc = sc;
 
-       ifnet_reference(ifs);
+       /* Allow the first Ethernet member to define the MTU */
+       if (TAILQ_EMPTY(&sc->sc_iflist)) {
+               sc->sc_ifp->if_mtu = ifs->if_mtu;
+       } else if (sc->sc_ifp->if_mtu != ifs->if_mtu) {
+               printf("%s: %s: invalid MTU for %s", __func__,
+                   sc->sc_ifp->if_xname,
+                   ifs->if_xname);
+               return EINVAL;
+       }
+
+       /*
+        * Assign the interface's MAC address to the bridge if it's the first
+        * member and the MAC address of the bridge has not been changed from
+        * the default (randomly) generated one.
+        */
+       if (bridge_inherit_mac && TAILQ_EMPTY(&sc->sc_iflist) &&
+           !memcmp(IF_LLADDR(sc->sc_ifp), sc->sc_defaddr, ETHER_ADDR_LEN)) {
+               bcopy(IF_LLADDR(ifs), eaddr, ETHER_ADDR_LEN);
+               sc->sc_ifaddr = ifs;
+               ifnet_reference(ifs);   /* for sc_ifaddr */
+               lladdr_changed = 1;
+       }
 
        ifs->if_bridge = sc;
 #if BRIDGESTP
        bstp_create(&sc->sc_stp, &bif->bif_stp, bif->bif_ifp);
 #endif /* BRIDGESTP */
 
        ifs->if_bridge = sc;
 #if BRIDGESTP
        bstp_create(&sc->sc_stp, &bif->bif_stp, bif->bif_ifp);
 #endif /* BRIDGESTP */
+
        /*
         * XXX: XLOCK HERE!?!
         */
        /*
         * XXX: XLOCK HERE!?!
         */
@@ -1946,59 +2383,71 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg)
        bridge_mutecaps(sc);
 #endif /* HAS_IF_CAP */
 
        bridge_mutecaps(sc);
 #endif /* HAS_IF_CAP */
 
+       bridge_set_tso(sc);
+
 
 
+       /*
+        * Place the interface into promiscuous mode.
+        */
        switch (ifs->if_type) {
        case IFT_ETHER:
        case IFT_L2VLAN:
        switch (ifs->if_type) {
        case IFT_ETHER:
        case IFT_L2VLAN:
-               /*
-                * Place the interface into promiscuous mode.
-                */
                error = ifnet_set_promiscuous(ifs, 1);
                if (error) {
                        /* Ignore error when device is not up */
                error = ifnet_set_promiscuous(ifs, 1);
                if (error) {
                        /* Ignore error when device is not up */
-                       if (error != ENETDOWN)
+                       if (error != ENETDOWN) {
                                goto out;
                                goto out;
+                       }
                        error = 0;
                } else {
                        error = 0;
                } else {
-                       bif->bif_promisc = 1;
+                       bif->bif_flags |= BIFF_PROMISC;
                }
                break;
 
                }
                break;
 
-       case IFT_GIF:
+       default:
                break;
                break;
+       }
 
 
-       default:
-               error = EINVAL;
-               goto out;
+       /*
+        * The new member may change the link status of the bridge interface
+        */
+       if (interface_media_active(ifs)) {
+               bif->bif_flags |= BIFF_MEDIA_ACTIVE;
+       } else {
+               bif->bif_flags &= ~BIFF_MEDIA_ACTIVE;
        }
 
        }
 
-       /* 
+       event_code = bridge_updatelinkstatus(sc);
+
+       /*
         * Respect lock ordering with DLIL lock for the following operations
         */
        BRIDGE_UNLOCK(sc);
 
         * Respect lock ordering with DLIL lock for the following operations
         */
        BRIDGE_UNLOCK(sc);
 
+
        /*
         * install an interface filter
         */
        /*
         * install an interface filter
         */
-       memset(&iff, 0, sizeof (struct iff_filter));
+       memset(&iff, 0, sizeof(struct iff_filter));
        iff.iff_cookie = bif;
        iff.iff_name = "com.apple.kernel.bsd.net.if_bridge";
        iff.iff_input = bridge_iff_input;
        iff.iff_cookie = bif;
        iff.iff_name = "com.apple.kernel.bsd.net.if_bridge";
        iff.iff_input = bridge_iff_input;
-#if BRIDGE_MEMBER_OUT_FILTER
        iff.iff_output = bridge_iff_output;
        iff.iff_output = bridge_iff_output;
-#endif /* BRIDGE_MEMBER_OUT_FILTER */
        iff.iff_event = bridge_iff_event;
        iff.iff_detached = bridge_iff_detached;
        iff.iff_event = bridge_iff_event;
        iff.iff_detached = bridge_iff_detached;
-       error = iflt_attach(ifs, &iff, &bif->bif_iff_ref);
+       error = dlil_attach_filter(ifs, &iff, &bif->bif_iff_ref,
+           DLIL_IFF_TSO | DLIL_IFF_INTERNAL);
        if (error != 0) {
                printf("%s: iflt_attach failed %d\n", __func__, error);
                BRIDGE_LOCK(sc);
                goto out;
        }
        if (error != 0) {
                printf("%s: iflt_attach failed %d\n", __func__, error);
                BRIDGE_LOCK(sc);
                goto out;
        }
-       bif->bif_filter_attached = 1;
+       BRIDGE_LOCK(sc);
+       bif->bif_flags |= BIFF_FILTER_ATTACHED;
+       BRIDGE_UNLOCK(sc);
 
        /*
 
        /*
-        * install an dummy "bridge" protocol
+        * install a dummy "bridge" protocol
         */
        if ((error = bridge_attach_protocol(ifs)) != 0) {
                if (error != 0) {
         */
        if ((error = bridge_attach_protocol(ifs)) != 0) {
                if (error != 0) {
@@ -2008,15 +2457,27 @@ bridge_ioctl_add(struct bridge_softc *sc, void *arg)
                        goto out;
                }
        }
                        goto out;
                }
        }
-       bif->bif_proto_attached = 1;
+       BRIDGE_LOCK(sc);
+       bif->bif_flags |= BIFF_PROTO_ATTACHED;
+       BRIDGE_UNLOCK(sc);
+
+       if (lladdr_changed &&
+           (error = ifnet_set_lladdr(bifp, eaddr, ETHER_ADDR_LEN)) != 0) {
+               printf("%s: ifnet_set_lladdr failed %d\n", __func__, error);
+       }
+
+       if (event_code != 0) {
+               bridge_link_event(bifp, event_code);
+       }
 
        BRIDGE_LOCK(sc);
 
 out:
 
        BRIDGE_LOCK(sc);
 
 out:
-       if (error && bif != NULL)
+       if (error && bif != NULL) {
                bridge_delete_member(sc, bif, 1);
                bridge_delete_member(sc, bif, 1);
+       }
 
 
-       return (error);
+       return error;
 }
 
 static int
 }
 
 static int
@@ -2026,18 +2487,20 @@ bridge_ioctl_del(struct bridge_softc *sc, void *arg)
        struct bridge_iflist *bif;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
        struct bridge_iflist *bif;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
        bridge_delete_member(sc, bif, 0);
 
 
        bridge_delete_member(sc, bif, 0);
 
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
-bridge_ioctl_purge(__unused struct bridge_softc *sc, __unused void *arg)
+bridge_ioctl_purge(struct bridge_softc *sc, void *arg)
 {
 {
-       return (0);
+#pragma unused(sc, arg)
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2045,39 +2508,48 @@ bridge_ioctl_gifflags(struct bridge_softc *sc, void *arg)
 {
        struct ifbreq *req = arg;
        struct bridge_iflist *bif;
 {
        struct ifbreq *req = arg;
        struct bridge_iflist *bif;
-       struct bstp_port *bp;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
+
+       struct bstp_port *bp;
 
        bp = &bif->bif_stp;
 
        bp = &bif->bif_stp;
-       req->ifbr_ifsflags = bif->bif_flags;
        req->ifbr_state = bp->bp_state;
        req->ifbr_priority = bp->bp_priority;
        req->ifbr_path_cost = bp->bp_path_cost;
        req->ifbr_state = bp->bp_state;
        req->ifbr_priority = bp->bp_priority;
        req->ifbr_path_cost = bp->bp_path_cost;
-       req->ifbr_portno = bif->bif_ifp->if_index & 0xfff;
        req->ifbr_proto = bp->bp_protover;
        req->ifbr_role = bp->bp_role;
        req->ifbr_stpflags = bp->bp_flags;
        req->ifbr_proto = bp->bp_protover;
        req->ifbr_role = bp->bp_role;
        req->ifbr_stpflags = bp->bp_flags;
-       req->ifbr_addrcnt = bif->bif_addrcnt;
-       req->ifbr_addrmax = bif->bif_addrmax;
-       req->ifbr_addrexceeded = bif->bif_addrexceeded;
-
        /* Copy STP state options as flags */
        /* Copy STP state options as flags */
-       if (bp->bp_operedge)
+       if (bp->bp_operedge) {
                req->ifbr_ifsflags |= IFBIF_BSTP_EDGE;
                req->ifbr_ifsflags |= IFBIF_BSTP_EDGE;
-       if (bp->bp_flags & BSTP_PORT_AUTOEDGE)
+       }
+       if (bp->bp_flags & BSTP_PORT_AUTOEDGE) {
                req->ifbr_ifsflags |= IFBIF_BSTP_AUTOEDGE;
                req->ifbr_ifsflags |= IFBIF_BSTP_AUTOEDGE;
-       if (bp->bp_ptp_link)
+       }
+       if (bp->bp_ptp_link) {
                req->ifbr_ifsflags |= IFBIF_BSTP_PTP;
                req->ifbr_ifsflags |= IFBIF_BSTP_PTP;
-       if (bp->bp_flags & BSTP_PORT_AUTOPTP)
+       }
+       if (bp->bp_flags & BSTP_PORT_AUTOPTP) {
                req->ifbr_ifsflags |= IFBIF_BSTP_AUTOPTP;
                req->ifbr_ifsflags |= IFBIF_BSTP_AUTOPTP;
-       if (bp->bp_flags & BSTP_PORT_ADMEDGE)
+       }
+       if (bp->bp_flags & BSTP_PORT_ADMEDGE) {
                req->ifbr_ifsflags |= IFBIF_BSTP_ADMEDGE;
                req->ifbr_ifsflags |= IFBIF_BSTP_ADMEDGE;
-       if (bp->bp_flags & BSTP_PORT_ADMCOST)
+       }
+       if (bp->bp_flags & BSTP_PORT_ADMCOST) {
                req->ifbr_ifsflags |= IFBIF_BSTP_ADMCOST;
                req->ifbr_ifsflags |= IFBIF_BSTP_ADMCOST;
-       return (0);
+       }
+
+       req->ifbr_ifsflags = bif->bif_ifflags;
+       req->ifbr_portno = bif->bif_ifp->if_index & 0xfff;
+       req->ifbr_addrcnt = bif->bif_addrcnt;
+       req->ifbr_addrmax = bif->bif_addrmax;
+       req->ifbr_addrexceeded = bif->bif_addrexceeded;
+
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2091,24 +2563,28 @@ bridge_ioctl_sifflags(struct bridge_softc *sc, void *arg)
 #endif /* BRIDGESTP */
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
 #endif /* BRIDGESTP */
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
 
-       if (req->ifbr_ifsflags & IFBIF_SPAN)
+       if (req->ifbr_ifsflags & IFBIF_SPAN) {
                /* SPAN is readonly */
                /* SPAN is readonly */
-               return (EINVAL);
+               return EINVAL;
+       }
 
 
 #if BRIDGESTP
        if (req->ifbr_ifsflags & IFBIF_STP) {
 
 
 #if BRIDGESTP
        if (req->ifbr_ifsflags & IFBIF_STP) {
-               if ((bif->bif_flags & IFBIF_STP) == 0) {
+               if ((bif->bif_ifflags & IFBIF_STP) == 0) {
                        error = bstp_enable(&bif->bif_stp);
                        error = bstp_enable(&bif->bif_stp);
-                       if (error)
-                               return (error);
+                       if (error) {
+                               return error;
+                       }
                }
        } else {
                }
        } else {
-               if ((bif->bif_flags & IFBIF_STP) != 0)
+               if ((bif->bif_ifflags & IFBIF_STP) != 0) {
                        bstp_disable(&bif->bif_stp);
                        bstp_disable(&bif->bif_stp);
+               }
        }
 
        /* Pass on STP flags */
        }
 
        /* Pass on STP flags */
@@ -2118,15 +2594,16 @@ bridge_ioctl_sifflags(struct bridge_softc *sc, void *arg)
        bstp_set_ptp(bp, req->ifbr_ifsflags & IFBIF_BSTP_PTP ? 1 : 0);
        bstp_set_autoptp(bp, req->ifbr_ifsflags & IFBIF_BSTP_AUTOPTP ? 1 : 0);
 #else /* !BRIDGESTP */
        bstp_set_ptp(bp, req->ifbr_ifsflags & IFBIF_BSTP_PTP ? 1 : 0);
        bstp_set_autoptp(bp, req->ifbr_ifsflags & IFBIF_BSTP_AUTOPTP ? 1 : 0);
 #else /* !BRIDGESTP */
-       if (req->ifbr_ifsflags & IFBIF_STP)
-               return (EOPNOTSUPP);
+       if (req->ifbr_ifsflags & IFBIF_STP) {
+               return EOPNOTSUPP;
+       }
 #endif /* !BRIDGESTP */
 
        /* Save the bits relating to the bridge */
 #endif /* !BRIDGESTP */
 
        /* Save the bits relating to the bridge */
-       bif->bif_flags = req->ifbr_ifsflags & IFBIFMASK;
+       bif->bif_ifflags = req->ifbr_ifsflags & IFBIFMASK;
 
 
 
 
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2136,8 +2613,7 @@ bridge_ioctl_scache(struct bridge_softc *sc, void *arg)
 
        sc->sc_brtmax = param->ifbrp_csize;
        bridge_rttrim(sc);
 
        sc->sc_brtmax = param->ifbrp_csize;
        bridge_rttrim(sc);
-
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2147,71 +2623,70 @@ bridge_ioctl_gcache(struct bridge_softc *sc, void *arg)
 
        param->ifbrp_csize = sc->sc_brtmax;
 
 
        param->ifbrp_csize = sc->sc_brtmax;
 
-       return (0);
+       return 0;
 }
 
 }
 
-
 #define BRIDGE_IOCTL_GIFS do { \
 #define BRIDGE_IOCTL_GIFS do { \
-       struct bridge_iflist *bif;                                      \
-       struct ifbreq breq;                                             \
-       char *buf, *outbuf;                                             \
-       unsigned int count, buflen, len;                                \
-                                                                       \
-       count = 0;                                                      \
-       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next)                    \
-               count++;                                                \
-       TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)                  \
-               count++;                                                \
-                                                                       \
-       buflen = sizeof (breq) * count;                                 \
-       if (bifc->ifbic_len == 0) {                                     \
-               bifc->ifbic_len = buflen;                               \
-               return (0);                                             \
-       }                                                               \
-       BRIDGE_UNLOCK(sc);                                              \
-       outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO);            \
-       BRIDGE_LOCK(sc);                                                \
-                                                                       \
-       count = 0;                                                      \
-       buf = outbuf;                                                   \
-       len = min(bifc->ifbic_len, buflen);                             \
-       bzero(&breq, sizeof (breq));                                    \
-       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {                  \
-               if (len < sizeof (breq))                                \
-                       break;                                          \
-                                                                       \
-               snprintf(breq.ifbr_ifsname, sizeof (breq.ifbr_ifsname), \
-                   "%s%d", ifnet_name(bif->bif_ifp),                   \
-                   ifnet_unit(bif->bif_ifp));                          \
-               /* Fill in the ifbreq structure */                      \
-               error = bridge_ioctl_gifflags(sc, &breq);               \
-               if (error)                                              \
-                       break;                                          \
-               memcpy(buf, &breq, sizeof (breq));                      \
-               count++;                                                \
-               buf += sizeof (breq);                                   \
-               len -= sizeof (breq);                                   \
-       }                                                               \
-       TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) {                \
-               if (len < sizeof (breq))                                \
-                       break;                                          \
-                                                                       \
-               snprintf(breq.ifbr_ifsname, sizeof (breq.ifbr_ifsname), \
-                   "%s%d", ifnet_name(bif->bif_ifp),                   \
-                   ifnet_unit(bif->bif_ifp));                          \
-               breq.ifbr_ifsflags = bif->bif_flags;                    \
-               breq.ifbr_portno = bif->bif_ifp->if_index & 0xfff;      \
-               memcpy(buf, &breq, sizeof (breq));                      \
-               count++;                                                \
-               buf += sizeof (breq);                                   \
-               len -= sizeof (breq);                                   \
-       }                                                               \
-                                                                       \
-       BRIDGE_UNLOCK(sc);                                              \
-       bifc->ifbic_len = sizeof (breq) * count;                        \
-       error = copyout(outbuf, bifc->ifbic_req, bifc->ifbic_len);      \
-       BRIDGE_LOCK(sc);                                                \
-       _FREE(outbuf, M_TEMP);                                          \
+       struct bridge_iflist *bif;                                      \
+       struct ifbreq breq;                                             \
+       char *buf, *outbuf;                                             \
+       unsigned int count, buflen, len;                                \
+                                                                        \
+       count = 0;                                                      \
+       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next)                    \
+               count++;                                                \
+       TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)                  \
+               count++;                                                \
+                                                                        \
+       buflen = sizeof (breq) * count;                                 \
+       if (bifc->ifbic_len == 0) {                                     \
+               bifc->ifbic_len = buflen;                               \
+               return (0);                                             \
+       }                                                               \
+       BRIDGE_UNLOCK(sc);                                              \
+       outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO);            \
+       BRIDGE_LOCK(sc);                                                \
+                                                                        \
+       count = 0;                                                      \
+       buf = outbuf;                                                   \
+       len = min(bifc->ifbic_len, buflen);                             \
+       bzero(&breq, sizeof (breq));                                    \
+       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {                  \
+               if (len < sizeof (breq))                                \
+                       break;                                          \
+                                                                        \
+               snprintf(breq.ifbr_ifsname, sizeof (breq.ifbr_ifsname), \
+                   "%s", bif->bif_ifp->if_xname);                      \
+       /* Fill in the ifbreq structure */                      \
+               error = bridge_ioctl_gifflags(sc, &breq);               \
+               if (error)                                              \
+                       break;                                          \
+               memcpy(buf, &breq, sizeof (breq));                      \
+               count++;                                                \
+               buf += sizeof (breq);                                   \
+               len -= sizeof (breq);                                   \
+       }                                                               \
+       TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) {                \
+               if (len < sizeof (breq))                                \
+                       break;                                          \
+                                                                        \
+               snprintf(breq.ifbr_ifsname,                             \
+                        sizeof (breq.ifbr_ifsname),                    \
+                        "%s", bif->bif_ifp->if_xname);                 \
+               breq.ifbr_ifsflags = bif->bif_ifflags;                  \
+               breq.ifbr_portno                                        \
+                       = bif->bif_ifp->if_index & 0xfff;               \
+               memcpy(buf, &breq, sizeof (breq));                      \
+               count++;                                                \
+               buf += sizeof (breq);                                   \
+               len -= sizeof (breq);                                   \
+       }                                                               \
+                                                                        \
+       BRIDGE_UNLOCK(sc);                                              \
+       bifc->ifbic_len = sizeof (breq) * count;                        \
+       error = copyout(outbuf, bifc->ifbic_req, bifc->ifbic_len);      \
+       BRIDGE_LOCK(sc);                                                \
+       _FREE(outbuf, M_TEMP);                                          \
 } while (0)
 
 static int
 } while (0)
 
 static int
@@ -2222,7 +2697,7 @@ bridge_ioctl_gifs64(struct bridge_softc *sc, void *arg)
 
        BRIDGE_IOCTL_GIFS;
 
 
        BRIDGE_IOCTL_GIFS;
 
-       return (error);
+       return error;
 }
 
 static int
 }
 
 static int
@@ -2233,61 +2708,62 @@ bridge_ioctl_gifs32(struct bridge_softc *sc, void *arg)
 
        BRIDGE_IOCTL_GIFS;
 
 
        BRIDGE_IOCTL_GIFS;
 
-       return (error);
-}
-
-
-#define BRIDGE_IOCTL_RTS do {                                              \
-       struct bridge_rtnode *brt;                                          \
-       char *buf, *outbuf;                                                 \
-       unsigned int count, buflen, len;                                    \
-       struct timespec now;                                                \
-                                                                           \
-       if (bac->ifbac_len == 0)                                            \
-               return (0);                                                 \
-                                                                           \
-       count = 0;                                                          \
-       LIST_FOREACH(brt, &sc->sc_rtlist, brt_list)                         \
-               count++;                                                    \
-       buflen = sizeof (bareq) * count;                                    \
-                                                                           \
-       BRIDGE_UNLOCK(sc);                                                  \
-       outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO);                \
-       BRIDGE_LOCK(sc);                                                    \
-                                                                           \
-       count = 0;                                                          \
-       buf = outbuf;                                                       \
-       len = min(bac->ifbac_len, buflen);                                  \
-       bzero(&bareq, sizeof (bareq));                                      \
-       LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {                       \
-               if (len < sizeof (bareq))                                   \
-                       goto out;                                           \
-               snprintf(bareq.ifba_ifsname, sizeof (bareq.ifba_ifsname),    \
-                   "%s%d", ifnet_name(brt->brt_ifp),                       \
-                   ifnet_unit(brt->brt_ifp));                              \
-               memcpy(bareq.ifba_dst, brt->brt_addr, sizeof (brt->brt_addr)); \
-               bareq.ifba_vlan = brt->brt_vlan;                            \
-               if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {   \
-                       nanouptime(&now);                                   \
-                       if ((unsigned long)now.tv_sec < brt->brt_expire)    \
-                               bareq.ifba_expire =                         \
-                                   brt->brt_expire - now.tv_sec;           \
-               } else                                                      \
-                       bareq.ifba_expire = 0;                              \
-               bareq.ifba_flags = brt->brt_flags;                          \
-                                                                           \
-               memcpy(buf, &bareq, sizeof (bareq));                        \
-               count++;                                                    \
-               buf += sizeof (bareq);                                      \
-               len -= sizeof (bareq);                                      \
-       }                                                                   \
-out:                                                                       \
-       BRIDGE_UNLOCK(sc);                                                  \
-       bac->ifbac_len = sizeof (bareq) * count;                                    \
-       error = copyout(outbuf, bac->ifbac_req, bac->ifbac_len);            \
-       BRIDGE_LOCK(sc);                                                    \
-       _FREE(outbuf, M_TEMP);                                              \
-       return (error);                                                     \
+       return error;
+}
+
+#define BRIDGE_IOCTL_RTS do {                                               \
+       struct bridge_rtnode *brt;                                          \
+       char *buf;                                                          \
+       char *outbuf = NULL;                                                \
+       unsigned int count, buflen, len;                                    \
+       unsigned long now;                                                  \
+                                                                            \
+       if (bac->ifbac_len == 0)                                            \
+               return (0);                                                 \
+                                                                            \
+       bzero(&bareq, sizeof (bareq));                                      \
+       count = 0;                                                          \
+       LIST_FOREACH(brt, &sc->sc_rtlist, brt_list)                         \
+               count++;                                                    \
+       buflen = sizeof (bareq) * count;                                    \
+                                                                            \
+       BRIDGE_UNLOCK(sc);                                                  \
+       outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO);                \
+       BRIDGE_LOCK(sc);                                                    \
+                                                                            \
+       count = 0;                                                          \
+       buf = outbuf;                                                       \
+       len = min(bac->ifbac_len, buflen);                                  \
+       LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {                       \
+               if (len < sizeof (bareq))                                   \
+                       goto out;                                           \
+               snprintf(bareq.ifba_ifsname, sizeof (bareq.ifba_ifsname),   \
+                        "%s", brt->brt_ifp->if_xname);                     \
+               memcpy(bareq.ifba_dst, brt->brt_addr, sizeof (brt->brt_addr)); \
+               bareq.ifba_vlan = brt->brt_vlan;                            \
+               if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {   \
+                       now = (unsigned long) net_uptime();                 \
+                       if (now < brt->brt_expire)                          \
+                               bareq.ifba_expire =                         \
+                                   brt->brt_expire - now;                  \
+               } else                                                      \
+                       bareq.ifba_expire = 0;                              \
+               bareq.ifba_flags = brt->brt_flags;                          \
+                                                                            \
+               memcpy(buf, &bareq, sizeof (bareq));                        \
+               count++;                                                    \
+               buf += sizeof (bareq);                                      \
+               len -= sizeof (bareq);                                      \
+       }                                                                   \
+out:                                                                        \
+       bac->ifbac_len = sizeof (bareq) * count;                            \
+       if (outbuf != NULL) {                                               \
+               BRIDGE_UNLOCK(sc);                                          \
+               error = copyout(outbuf, bac->ifbac_req, bac->ifbac_len);    \
+               _FREE(outbuf, M_TEMP);                                      \
+               BRIDGE_LOCK(sc);                                            \
+       }                                                                   \
+       return (error);                                                     \
 } while (0)
 
 static int
 } while (0)
 
 static int
@@ -2298,8 +2774,7 @@ bridge_ioctl_rts64(struct bridge_softc *sc, void *arg)
        int error = 0;
 
        BRIDGE_IOCTL_RTS;
        int error = 0;
 
        BRIDGE_IOCTL_RTS;
-
-       return (error);
+       return error;
 }
 
 static int
 }
 
 static int
@@ -2310,8 +2785,7 @@ bridge_ioctl_rts32(struct bridge_softc *sc, void *arg)
        int error = 0;
 
        BRIDGE_IOCTL_RTS;
        int error = 0;
 
        BRIDGE_IOCTL_RTS;
-
-       return (error);
+       return error;
 }
 
 static int
 }
 
 static int
@@ -2322,13 +2796,14 @@ bridge_ioctl_saddr32(struct bridge_softc *sc, void *arg)
        int error;
 
        bif = bridge_lookup_member(sc, req->ifba_ifsname);
        int error;
 
        bif = bridge_lookup_member(sc, req->ifba_ifsname);
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
        error = bridge_rtupdate(sc, req->ifba_dst, req->ifba_vlan, bif, 1,
            req->ifba_flags);
 
 
        error = bridge_rtupdate(sc, req->ifba_dst, req->ifba_vlan, bif, 1,
            req->ifba_flags);
 
-       return (error);
+       return error;
 }
 
 static int
 }
 
 static int
@@ -2339,13 +2814,14 @@ bridge_ioctl_saddr64(struct bridge_softc *sc, void *arg)
        int error;
 
        bif = bridge_lookup_member(sc, req->ifba_ifsname);
        int error;
 
        bif = bridge_lookup_member(sc, req->ifba_ifsname);
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
        error = bridge_rtupdate(sc, req->ifba_dst, req->ifba_vlan, bif, 1,
            req->ifba_flags);
 
 
        error = bridge_rtupdate(sc, req->ifba_dst, req->ifba_vlan, bif, 1,
            req->ifba_flags);
 
-       return (error);
+       return error;
 }
 
 static int
 }
 
 static int
@@ -2354,7 +2830,7 @@ bridge_ioctl_sto(struct bridge_softc *sc, void *arg)
        struct ifbrparam *param = arg;
 
        sc->sc_brttimeout = param->ifbrp_ctime;
        struct ifbrparam *param = arg;
 
        sc->sc_brttimeout = param->ifbrp_ctime;
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2363,7 +2839,7 @@ bridge_ioctl_gto(struct bridge_softc *sc, void *arg)
        struct ifbrparam *param = arg;
 
        param->ifbrp_ctime = sc->sc_brttimeout;
        struct ifbrparam *param = arg;
 
        param->ifbrp_ctime = sc->sc_brttimeout;
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2371,7 +2847,7 @@ bridge_ioctl_daddr32(struct bridge_softc *sc, void *arg)
 {
        struct ifbareq32 *req = arg;
 
 {
        struct ifbareq32 *req = arg;
 
-       return (bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan));
+       return bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan);
 }
 
 static int
 }
 
 static int
@@ -2379,7 +2855,7 @@ bridge_ioctl_daddr64(struct bridge_softc *sc, void *arg)
 {
        struct ifbareq64 *req = arg;
 
 {
        struct ifbareq64 *req = arg;
 
-       return (bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan));
+       return bridge_rtdaddr(sc, req->ifba_dst, req->ifba_vlan);
 }
 
 static int
 }
 
 static int
@@ -2388,7 +2864,7 @@ bridge_ioctl_flush(struct bridge_softc *sc, void *arg)
        struct ifbreq *req = arg;
 
        bridge_rtflush(sc, req->ifbr_ifsflags);
        struct ifbreq *req = arg;
 
        bridge_rtflush(sc, req->ifbr_ifsflags);
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2398,7 +2874,7 @@ bridge_ioctl_gpri(struct bridge_softc *sc, void *arg)
        struct bstp_state *bs = &sc->sc_stp;
 
        param->ifbrp_prio = bs->bs_bridge_priority;
        struct bstp_state *bs = &sc->sc_stp;
 
        param->ifbrp_prio = bs->bs_bridge_priority;
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2407,10 +2883,10 @@ bridge_ioctl_spri(struct bridge_softc *sc, void *arg)
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
-       return (bstp_set_priority(&sc->sc_stp, param->ifbrp_prio));
+       return bstp_set_priority(&sc->sc_stp, param->ifbrp_prio);
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
-       return (EOPNOTSUPP);
+       return EOPNOTSUPP;
 #endif /* !BRIDGESTP */
 }
 
 #endif /* !BRIDGESTP */
 }
 
@@ -2421,7 +2897,7 @@ bridge_ioctl_ght(struct bridge_softc *sc, void *arg)
        struct bstp_state *bs = &sc->sc_stp;
 
        param->ifbrp_hellotime = bs->bs_bridge_htime >> 8;
        struct bstp_state *bs = &sc->sc_stp;
 
        param->ifbrp_hellotime = bs->bs_bridge_htime >> 8;
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2430,21 +2906,23 @@ bridge_ioctl_sht(struct bridge_softc *sc, void *arg)
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
-       return (bstp_set_htime(&sc->sc_stp, param->ifbrp_hellotime));
+       return bstp_set_htime(&sc->sc_stp, param->ifbrp_hellotime);
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
-       return (EOPNOTSUPP);
+       return EOPNOTSUPP;
 #endif /* !BRIDGESTP */
 }
 
 static int
 bridge_ioctl_gfd(struct bridge_softc *sc, void *arg)
 {
 #endif /* !BRIDGESTP */
 }
 
 static int
 bridge_ioctl_gfd(struct bridge_softc *sc, void *arg)
 {
-       struct ifbrparam *param = arg;
-       struct bstp_state *bs = &sc->sc_stp;
+       struct ifbrparam *param;
+       struct bstp_state *bs;
 
 
+       param = arg;
+       bs = &sc->sc_stp;
        param->ifbrp_fwddelay = bs->bs_bridge_fdelay >> 8;
        param->ifbrp_fwddelay = bs->bs_bridge_fdelay >> 8;
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2453,21 +2931,23 @@ bridge_ioctl_sfd(struct bridge_softc *sc, void *arg)
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
-       return (bstp_set_fdelay(&sc->sc_stp, param->ifbrp_fwddelay));
+       return bstp_set_fdelay(&sc->sc_stp, param->ifbrp_fwddelay);
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
-       return (EOPNOTSUPP);
+       return EOPNOTSUPP;
 #endif /* !BRIDGESTP */
 }
 
 static int
 bridge_ioctl_gma(struct bridge_softc *sc, void *arg)
 {
 #endif /* !BRIDGESTP */
 }
 
 static int
 bridge_ioctl_gma(struct bridge_softc *sc, void *arg)
 {
-       struct ifbrparam *param = arg;
-       struct bstp_state *bs = &sc->sc_stp;
+       struct ifbrparam *param;
+       struct bstp_state *bs;
 
 
+       param = arg;
+       bs = &sc->sc_stp;
        param->ifbrp_maxage = bs->bs_bridge_max_age >> 8;
        param->ifbrp_maxage = bs->bs_bridge_max_age >> 8;
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2476,10 +2956,10 @@ bridge_ioctl_sma(struct bridge_softc *sc, void *arg)
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
-       return (bstp_set_maxage(&sc->sc_stp, param->ifbrp_maxage));
+       return bstp_set_maxage(&sc->sc_stp, param->ifbrp_maxage);
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
-       return (EOPNOTSUPP);
+       return EOPNOTSUPP;
 #endif /* !BRIDGESTP */
 }
 
 #endif /* !BRIDGESTP */
 }
 
@@ -2491,13 +2971,14 @@ bridge_ioctl_sifprio(struct bridge_softc *sc, void *arg)
        struct bridge_iflist *bif;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
        struct bridge_iflist *bif;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
 
-       return (bstp_set_port_priority(&bif->bif_stp, req->ifbr_priority));
+       return bstp_set_port_priority(&bif->bif_stp, req->ifbr_priority);
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
-       return (EOPNOTSUPP);
+       return EOPNOTSUPP;
 #endif /* !BRIDGESTP */
 }
 
 #endif /* !BRIDGESTP */
 }
 
@@ -2509,13 +2990,14 @@ bridge_ioctl_sifcost(struct bridge_softc *sc, void *arg)
        struct bridge_iflist *bif;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
        struct bridge_iflist *bif;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
 
-       return (bstp_set_path_cost(&bif->bif_stp, req->ifbr_path_cost));
+       return bstp_set_path_cost(&bif->bif_stp, req->ifbr_path_cost);
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
-       return (EOPNOTSUPP);
+       return EOPNOTSUPP;
 #endif /* !BRIDGESTP */
 }
 
 #endif /* !BRIDGESTP */
 }
 
@@ -2526,7 +3008,7 @@ bridge_ioctl_gfilt(struct bridge_softc *sc, void *arg)
 
        param->ifbrp_filter = sc->sc_filter_flags;
 
 
        param->ifbrp_filter = sc->sc_filter_flags;
 
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2534,17 +3016,19 @@ bridge_ioctl_sfilt(struct bridge_softc *sc, void *arg)
 {
        struct ifbrparam *param = arg;
 
 {
        struct ifbrparam *param = arg;
 
-       if (param->ifbrp_filter & ~IFBF_FILT_MASK)
-               return (EINVAL);
+       if (param->ifbrp_filter & ~IFBF_FILT_MASK) {
+               return EINVAL;
+       }
 
 #ifndef BRIDGE_IPF
 
 #ifndef BRIDGE_IPF
-       if (param->ifbrp_filter & IFBF_FILT_USEIPF)
-               return (EINVAL);
+       if (param->ifbrp_filter & IFBF_FILT_USEIPF) {
+               return EINVAL;
+       }
 #endif
 
        sc->sc_filter_flags = param->ifbrp_filter;
 
 #endif
 
        sc->sc_filter_flags = param->ifbrp_filter;
 
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2554,11 +3038,12 @@ bridge_ioctl_sifmaxaddr(struct bridge_softc *sc, void *arg)
        struct bridge_iflist *bif;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
        struct bridge_iflist *bif;
 
        bif = bridge_lookup_member(sc, req->ifbr_ifsname);
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
        bif->bif_addrmax = req->ifbr_addrmax;
 
        bif->bif_addrmax = req->ifbr_addrmax;
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2569,37 +3054,47 @@ bridge_ioctl_addspan(struct bridge_softc *sc, void *arg)
        struct ifnet *ifs;
 
        ifs = ifunit(req->ifbr_ifsname);
        struct ifnet *ifs;
 
        ifs = ifunit(req->ifbr_ifsname);
-       if (ifs == NULL)
-               return (ENOENT);
+       if (ifs == NULL) {
+               return ENOENT;
+       }
+
+       if (IFNET_IS_INTCOPROC(ifs)) {
+               return EINVAL;
+       }
 
        TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
 
        TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
-               if (ifs == bif->bif_ifp)
-                       return (EBUSY);
+       if (ifs == bif->bif_ifp) {
+               return EBUSY;
+       }
 
 
-       if (ifs->if_bridge != NULL)
-               return (EBUSY);
+       if (ifs->if_bridge != NULL) {
+               return EBUSY;
+       }
 
        switch (ifs->if_type) {
 
        switch (ifs->if_type) {
-               case IFT_ETHER:
-               case IFT_GIF:
-               case IFT_L2VLAN:
-                       break;
-               default:
-                       return (EINVAL);
+       case IFT_ETHER:
+       case IFT_L2VLAN:
+               break;
+       case IFT_GIF:
+       /* currently not supported */
+       /* FALLTHRU */
+       default:
+               return EINVAL;
        }
 
        }
 
-       bif = _MALLOC(sizeof (*bif), M_DEVBUF, M_NOWAIT|M_ZERO);
-       if (bif == NULL)
-               return (ENOMEM);
+       bif = _MALLOC(sizeof(*bif), M_DEVBUF, M_WAITOK | M_ZERO);
+       if (bif == NULL) {
+               return ENOMEM;
+       }
 
        bif->bif_ifp = ifs;
 
        bif->bif_ifp = ifs;
-       bif->bif_flags = IFBIF_SPAN;
+       bif->bif_ifflags = IFBIF_SPAN;
 
        ifnet_reference(bif->bif_ifp);
 
        TAILQ_INSERT_HEAD(&sc->sc_spanlist, bif, bif_next);
 
 
        ifnet_reference(bif->bif_ifp);
 
        TAILQ_INSERT_HEAD(&sc->sc_spanlist, bif, bif_next);
 
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2610,44 +3105,47 @@ bridge_ioctl_delspan(struct bridge_softc *sc, void *arg)
        struct ifnet *ifs;
 
        ifs = ifunit(req->ifbr_ifsname);
        struct ifnet *ifs;
 
        ifs = ifunit(req->ifbr_ifsname);
-       if (ifs == NULL)
-               return (ENOENT);
+       if (ifs == NULL) {
+               return ENOENT;
+       }
 
        TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
 
        TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
-               if (ifs == bif->bif_ifp)
-                       break;
+       if (ifs == bif->bif_ifp) {
+               break;
+       }
 
 
-       if (bif == NULL)
-               return (ENOENT);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
        bridge_delete_span(sc, bif);
 
 
        bridge_delete_span(sc, bif);
 
-       return (0);
-}
-
-#define BRIDGE_IOCTL_GBPARAM do {                                      \
-       struct bstp_state *bs = &sc->sc_stp;                            \
-       struct bstp_port *root_port;                                    \
-                                                                       \
-       req->ifbop_maxage = bs->bs_bridge_max_age >> 8;                 \
-       req->ifbop_hellotime = bs->bs_bridge_htime >> 8;                \
-       req->ifbop_fwddelay = bs->bs_bridge_fdelay >> 8;                \
-                                                                       \
-       root_port = bs->bs_root_port;                                   \
-       if (root_port == NULL)                                          \
-               req->ifbop_root_port = 0;                               \
-       else                                                            \
-               req->ifbop_root_port = root_port->bp_ifp->if_index;     \
-                                                                       \
-       req->ifbop_holdcount = bs->bs_txholdcount;                      \
-       req->ifbop_priority = bs->bs_bridge_priority;                   \
-       req->ifbop_protocol = bs->bs_protover;                          \
-       req->ifbop_root_path_cost = bs->bs_root_pv.pv_cost;             \
-       req->ifbop_bridgeid = bs->bs_bridge_pv.pv_dbridge_id;           \
-       req->ifbop_designated_root = bs->bs_root_pv.pv_root_id;         \
-       req->ifbop_designated_bridge = bs->bs_root_pv.pv_dbridge_id;    \
-       req->ifbop_last_tc_time.tv_sec = bs->bs_last_tc_time.tv_sec;    \
-       req->ifbop_last_tc_time.tv_usec = bs->bs_last_tc_time.tv_usec;  \
+       return 0;
+}
+
+#define BRIDGE_IOCTL_GBPARAM do {                                       \
+       struct bstp_state *bs = &sc->sc_stp;                            \
+       struct bstp_port *root_port;                                    \
+                                                                        \
+       req->ifbop_maxage = bs->bs_bridge_max_age >> 8;                 \
+       req->ifbop_hellotime = bs->bs_bridge_htime >> 8;                \
+       req->ifbop_fwddelay = bs->bs_bridge_fdelay >> 8;                \
+                                                                        \
+       root_port = bs->bs_root_port;                                   \
+       if (root_port == NULL)                                          \
+               req->ifbop_root_port = 0;                               \
+       else                                                            \
+               req->ifbop_root_port = root_port->bp_ifp->if_index;     \
+                                                                        \
+       req->ifbop_holdcount = bs->bs_txholdcount;                      \
+       req->ifbop_priority = bs->bs_bridge_priority;                   \
+       req->ifbop_protocol = bs->bs_protover;                          \
+       req->ifbop_root_path_cost = bs->bs_root_pv.pv_cost;             \
+       req->ifbop_bridgeid = bs->bs_bridge_pv.pv_dbridge_id;           \
+       req->ifbop_designated_root = bs->bs_root_pv.pv_root_id;         \
+       req->ifbop_designated_bridge = bs->bs_root_pv.pv_dbridge_id;    \
+       req->ifbop_last_tc_time.tv_sec = bs->bs_last_tc_time.tv_sec;    \
+       req->ifbop_last_tc_time.tv_usec = bs->bs_last_tc_time.tv_usec;  \
 } while (0)
 
 static int
 } while (0)
 
 static int
@@ -2656,8 +3154,7 @@ bridge_ioctl_gbparam32(struct bridge_softc *sc, void *arg)
        struct ifbropreq32 *req = arg;
 
        BRIDGE_IOCTL_GBPARAM;
        struct ifbropreq32 *req = arg;
 
        BRIDGE_IOCTL_GBPARAM;
-
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2666,8 +3163,7 @@ bridge_ioctl_gbparam64(struct bridge_softc *sc, void *arg)
        struct ifbropreq64 *req = arg;
 
        BRIDGE_IOCTL_GBPARAM;
        struct ifbropreq64 *req = arg;
 
        BRIDGE_IOCTL_GBPARAM;
-
-       return (0);
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -2676,63 +3172,63 @@ bridge_ioctl_grte(struct bridge_softc *sc, void *arg)
        struct ifbrparam *param = arg;
 
        param->ifbrp_cexceeded = sc->sc_brtexceeded;
        struct ifbrparam *param = arg;
 
        param->ifbrp_cexceeded = sc->sc_brtexceeded;
-       return (0);
-}
-
-#define BRIDGE_IOCTL_GIFSSTP do {                                      \
-       struct bridge_iflist *bif;                                      \
-       struct bstp_port *bp;                                           \
-       struct ifbpstpreq bpreq;                                        \
-       char *buf, *outbuf;                                             \
-       unsigned int count, buflen, len;                                \
-                                                                       \
-       count = 0;                                                      \
-       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {                  \
-               if ((bif->bif_flags & IFBIF_STP) != 0)                  \
-                       count++;                                        \
-       }                                                               \
-                                                                       \
-       buflen = sizeof (bpreq) * count;                                \
-       if (bifstp->ifbpstp_len == 0) {                                 \
-               bifstp->ifbpstp_len = buflen;                           \
-               return (0);                                             \
-       }                                                               \
-                                                                       \
-       BRIDGE_UNLOCK(sc);                                              \
-       outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO);            \
-       BRIDGE_LOCK(sc);                                                \
-                                                                       \
-       count = 0;                                                      \
-       buf = outbuf;                                                   \
-       len = min(bifstp->ifbpstp_len, buflen);                         \
-       bzero(&bpreq, sizeof (bpreq));                                  \
-       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {                  \
-               if (len < sizeof (bpreq))                               \
-                       break;                                          \
-                                                                       \
-               if ((bif->bif_flags & IFBIF_STP) == 0)                  \
-                       continue;                                       \
-                                                                       \
-               bp = &bif->bif_stp;                                     \
-               bpreq.ifbp_portno = bif->bif_ifp->if_index & 0xfff;     \
-               bpreq.ifbp_fwd_trans = bp->bp_forward_transitions;      \
-               bpreq.ifbp_design_cost = bp->bp_desg_pv.pv_cost;        \
-               bpreq.ifbp_design_port = bp->bp_desg_pv.pv_port_id;     \
-               bpreq.ifbp_design_bridge = bp->bp_desg_pv.pv_dbridge_id; \
-               bpreq.ifbp_design_root = bp->bp_desg_pv.pv_root_id;     \
-                                                                       \
-               memcpy(buf, &bpreq, sizeof (bpreq));                    \
-               count++;                                                \
-               buf += sizeof (bpreq);                                  \
-               len -= sizeof (bpreq);                                  \
-       }                                                               \
-                                                                       \
-       BRIDGE_UNLOCK(sc);                                              \
-       bifstp->ifbpstp_len = sizeof (bpreq) * count;                   \
+       return 0;
+}
+
+#define BRIDGE_IOCTL_GIFSSTP do {                                       \
+       struct bridge_iflist *bif;                                      \
+       struct bstp_port *bp;                                           \
+       struct ifbpstpreq bpreq;                                        \
+       char *buf, *outbuf;                                             \
+       unsigned int count, buflen, len;                                \
+                                                                        \
+       count = 0;                                                      \
+       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {                  \
+               if ((bif->bif_ifflags & IFBIF_STP) != 0)                \
+                       count++;                                        \
+       }                                                               \
+                                                                        \
+       buflen = sizeof (bpreq) * count;                                \
+       if (bifstp->ifbpstp_len == 0) {                                 \
+               bifstp->ifbpstp_len = buflen;                           \
+               return (0);                                             \
+       }                                                               \
+                                                                        \
+       BRIDGE_UNLOCK(sc);                                              \
+       outbuf = _MALLOC(buflen, M_TEMP, M_WAITOK | M_ZERO);            \
+       BRIDGE_LOCK(sc);                                                \
+                                                                        \
+       count = 0;                                                      \
+       buf = outbuf;                                                   \
+       len = min(bifstp->ifbpstp_len, buflen);                         \
+       bzero(&bpreq, sizeof (bpreq));                                  \
+       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {                  \
+               if (len < sizeof (bpreq))                               \
+                       break;                                          \
+                                                                        \
+               if ((bif->bif_ifflags & IFBIF_STP) == 0)                \
+                       continue;                                       \
+                                                                        \
+               bp = &bif->bif_stp;                                     \
+               bpreq.ifbp_portno = bif->bif_ifp->if_index & 0xfff;     \
+               bpreq.ifbp_fwd_trans = bp->bp_forward_transitions;      \
+               bpreq.ifbp_design_cost = bp->bp_desg_pv.pv_cost;        \
+               bpreq.ifbp_design_port = bp->bp_desg_pv.pv_port_id;     \
+               bpreq.ifbp_design_bridge = bp->bp_desg_pv.pv_dbridge_id; \
+               bpreq.ifbp_design_root = bp->bp_desg_pv.pv_root_id;     \
+                                                                        \
+               memcpy(buf, &bpreq, sizeof (bpreq));                    \
+               count++;                                                \
+               buf += sizeof (bpreq);                                  \
+               len -= sizeof (bpreq);                                  \
+       }                                                               \
+                                                                        \
+       BRIDGE_UNLOCK(sc);                                              \
+       bifstp->ifbpstp_len = sizeof (bpreq) * count;                   \
        error = copyout(outbuf, bifstp->ifbpstp_req, bifstp->ifbpstp_len); \
        error = copyout(outbuf, bifstp->ifbpstp_req, bifstp->ifbpstp_len); \
-       BRIDGE_LOCK(sc);                                                \
-       _FREE(outbuf, M_TEMP);                                          \
-       return (error);                                                 \
+       BRIDGE_LOCK(sc);                                                \
+       _FREE(outbuf, M_TEMP);                                          \
+       return (error);                                                 \
 } while (0)
 
 static int
 } while (0)
 
 static int
@@ -2742,8 +3238,7 @@ bridge_ioctl_gifsstp32(struct bridge_softc *sc, void *arg)
        int error = 0;
 
        BRIDGE_IOCTL_GIFSSTP;
        int error = 0;
 
        BRIDGE_IOCTL_GIFSSTP;
-
-       return (error);
+       return error;
 }
 
 static int
 }
 
 static int
@@ -2753,8 +3248,7 @@ bridge_ioctl_gifsstp64(struct bridge_softc *sc, void *arg)
        int error = 0;
 
        BRIDGE_IOCTL_GIFSSTP;
        int error = 0;
 
        BRIDGE_IOCTL_GIFSSTP;
-
-       return (error);
+       return error;
 }
 
 static int
 }
 
 static int
@@ -2763,10 +3257,10 @@ bridge_ioctl_sproto(struct bridge_softc *sc, void *arg)
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
-       return (bstp_set_protocol(&sc->sc_stp, param->ifbrp_proto));
+       return bstp_set_protocol(&sc->sc_stp, param->ifbrp_proto);
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
-       return (EOPNOTSUPP);
+       return EOPNOTSUPP;
 #endif /* !BRIDGESTP */
 }
 
 #endif /* !BRIDGESTP */
 }
 
@@ -2776,53 +3270,451 @@ bridge_ioctl_stxhc(struct bridge_softc *sc, void *arg)
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
 #if BRIDGESTP
        struct ifbrparam *param = arg;
 
-       return (bstp_set_holdcount(&sc->sc_stp, param->ifbrp_txhc));
+       return bstp_set_holdcount(&sc->sc_stp, param->ifbrp_txhc);
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
 #else /* !BRIDGESTP */
 #pragma unused(sc, arg)
-       return (EOPNOTSUPP);
+       return EOPNOTSUPP;
 #endif /* !BRIDGESTP */
 }
 
 #endif /* !BRIDGESTP */
 }
 
-/*
- * bridge_ifdetach:
- *
- *     Detach an interface from a bridge.  Called when a member
- *     interface is detaching.
- */
-__private_extern__ void
-bridge_ifdetach(struct bridge_iflist *bif, struct ifnet *ifp)
+
+static int
+bridge_ioctl_ghostfilter(struct bridge_softc *sc, void *arg)
 {
 {
-       struct bridge_softc *sc = ifp->if_bridge;
+       struct ifbrhostfilter *req = arg;
+       struct bridge_iflist *bif;
 
 
-#if BRIDGE_DEBUG
-       printf("%s: %s%d\n", __func__, ifnet_name(ifp), ifnet_unit(ifp));
-#endif
+       bif = bridge_lookup_member(sc, req->ifbrhf_ifsname);
+       if (bif == NULL) {
+               return ENOENT;
+       }
 
 
-       /* Check if the interface is a bridge member */
-       if (sc != NULL) {
-               BRIDGE_LOCK(sc);
+       bzero(req, sizeof(struct ifbrhostfilter));
+       if (bif->bif_flags & BIFF_HOST_FILTER) {
+               req->ifbrhf_flags |= IFBRHF_ENABLED;
+               bcopy(bif->bif_hf_hwsrc, req->ifbrhf_hwsrca,
+                   ETHER_ADDR_LEN);
+               req->ifbrhf_ipsrc = bif->bif_hf_ipsrc.s_addr;
+       }
+       return 0;
+}
 
 
-               bif = bridge_lookup_member_if(sc, ifp);
-               if (bif != NULL)
-                       bridge_delete_member(sc, bif, 1);
+static int
+bridge_ioctl_shostfilter(struct bridge_softc *sc, void *arg)
+{
+       struct ifbrhostfilter *req = arg;
+       struct bridge_iflist *bif;
 
 
-               BRIDGE_UNLOCK(sc);
-               return;
+       bif = bridge_lookup_member(sc, req->ifbrhf_ifsname);
+       if (bif == NULL) {
+               return ENOENT;
        }
 
        }
 
-       /* Check if the interface is a span port */
-       lck_mtx_lock(bridge_list_mtx);
+       INC_ATOMIC_INT64_LIM(net_api_stats.nas_vmnet_total);
+
+       if (req->ifbrhf_flags & IFBRHF_ENABLED) {
+               bif->bif_flags |= BIFF_HOST_FILTER;
+
+               if (req->ifbrhf_flags & IFBRHF_HWSRC) {
+                       bcopy(req->ifbrhf_hwsrca, bif->bif_hf_hwsrc,
+                           ETHER_ADDR_LEN);
+                       if (bcmp(req->ifbrhf_hwsrca, ethernulladdr,
+                           ETHER_ADDR_LEN) != 0) {
+                               bif->bif_flags |= BIFF_HF_HWSRC;
+                       } else {
+                               bif->bif_flags &= ~BIFF_HF_HWSRC;
+                       }
+               }
+               if (req->ifbrhf_flags & IFBRHF_IPSRC) {
+                       bif->bif_hf_ipsrc.s_addr = req->ifbrhf_ipsrc;
+                       if (bif->bif_hf_ipsrc.s_addr != INADDR_ANY) {
+                               bif->bif_flags |= BIFF_HF_IPSRC;
+                       } else {
+                               bif->bif_flags &= ~BIFF_HF_IPSRC;
+                       }
+               }
+       } else {
+               bif->bif_flags &= ~(BIFF_HOST_FILTER | BIFF_HF_HWSRC |
+                   BIFF_HF_IPSRC);
+               bzero(bif->bif_hf_hwsrc, ETHER_ADDR_LEN);
+               bif->bif_hf_ipsrc.s_addr = INADDR_ANY;
+       }
+
+       return 0;
+}
+
+
+/*
+ * bridge_ifdetach:
+ *
+ *     Detach an interface from a bridge.  Called when a member
+ *     interface is detaching.
+ */
+static void
+bridge_ifdetach(struct ifnet *ifp)
+{
+       struct bridge_iflist *bif;
+       struct bridge_softc *sc = ifp->if_bridge;
+
+#if BRIDGE_DEBUG
+       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+               printf("%s: %s\n", __func__, ifp->if_xname);
+       }
+#endif /* BRIDGE_DEBUG */
+
+       /* Check if the interface is a bridge member */
+       if (sc != NULL) {
+               BRIDGE_LOCK(sc);
+               bif = bridge_lookup_member_if(sc, ifp);
+               if (bif != NULL) {
+                       bridge_delete_member(sc, bif, 1);
+               }
+               BRIDGE_UNLOCK(sc);
+               return;
+       }
+       /* Check if the interface is a span port */
+       lck_mtx_lock(&bridge_list_mtx);
        LIST_FOREACH(sc, &bridge_list, sc_list) {
                BRIDGE_LOCK(sc);
                TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
        LIST_FOREACH(sc, &bridge_list, sc_list) {
                BRIDGE_LOCK(sc);
                TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next)
-                       if (ifp == bif->bif_ifp) {
-                               bridge_delete_span(sc, bif);
-                               break;
+               if (ifp == bif->bif_ifp) {
+                       bridge_delete_span(sc, bif);
+                       break;
+               }
+               BRIDGE_UNLOCK(sc);
+       }
+       lck_mtx_unlock(&bridge_list_mtx);
+}
+
+/*
+ * bridge_proto_attach_changed
+ *
+ *     Called when protocol attachment on the interface changes.
+ */
+static void
+bridge_proto_attach_changed(struct ifnet *ifp)
+{
+       boolean_t changed = FALSE;
+       struct bridge_iflist *bif;
+       boolean_t input_broadcast;
+       struct bridge_softc *sc = ifp->if_bridge;
+
+#if BRIDGE_DEBUG
+       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+               printf("%s: %s\n", __func__, ifp->if_xname);
+       }
+#endif /* BRIDGE_DEBUG */
+       if (sc == NULL) {
+               return;
+       }
+       /*
+        * Selectively enable input broadcast only when necessary.
+        * The bridge interface itself attaches a fake protocol
+        * so checking for at least two protocols means that the
+        * interface is being used for something besides bridging.
+        */
+       input_broadcast = if_get_protolist(ifp, NULL, 0) >= 2;
+       BRIDGE_LOCK(sc);
+       bif = bridge_lookup_member_if(sc, ifp);
+       if (bif != NULL) {
+               if (input_broadcast) {
+                       if ((bif->bif_flags & BIFF_INPUT_BROADCAST) == 0) {
+                               bif->bif_flags |= BIFF_INPUT_BROADCAST;
+                               changed = TRUE;
                        }
                        }
+               } else if ((bif->bif_flags & BIFF_INPUT_BROADCAST) != 0) {
+                       changed = TRUE;
+                       bif->bif_flags &= ~BIFF_INPUT_BROADCAST;
+               }
+       }
+       BRIDGE_UNLOCK(sc);
+#if BRIDGE_DEBUG
+       if ((if_bridge_debug & BR_DBGF_LIFECYCLE) != 0 && changed) {
+               printf("%s: input broadcast %s", ifp->if_xname,
+                   input_broadcast ? "ENABLED" : "DISABLED");
+       }
+#endif /* BRIDGE_DEBUG */
+       return;
+}
 
 
-               BRIDGE_UNLOCK(sc);
+/*
+ * interface_media_active:
+ *
+ *     Tells if an interface media is active.
+ */
+static int
+interface_media_active(struct ifnet *ifp)
+{
+       struct ifmediareq   ifmr;
+       int status = 0;
+
+       bzero(&ifmr, sizeof(ifmr));
+       if (ifnet_ioctl(ifp, 0, SIOCGIFMEDIA, &ifmr) == 0) {
+               if ((ifmr.ifm_status & IFM_AVALID) && ifmr.ifm_count > 0) {
+                       status = ifmr.ifm_status & IFM_ACTIVE ? 1 : 0;
+               }
+       }
+
+       return status;
+}
+
+/*
+ * bridge_updatelinkstatus:
+ *
+ *      Update the media active status of the bridge based on the
+ *     media active status of its member.
+ *     If changed, return the corresponding onf/off link event.
+ */
+static u_int32_t
+bridge_updatelinkstatus(struct bridge_softc *sc)
+{
+       struct bridge_iflist *bif;
+       int active_member = 0;
+       u_int32_t event_code = 0;
+
+       BRIDGE_LOCK_ASSERT_HELD(sc);
+
+       /*
+        * Find out if we have an active interface
+        */
+       TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+               if (bif->bif_flags & BIFF_MEDIA_ACTIVE) {
+                       active_member = 1;
+                       break;
+               }
+       }
+
+       if (active_member && !(sc->sc_flags & SCF_MEDIA_ACTIVE)) {
+               sc->sc_flags |= SCF_MEDIA_ACTIVE;
+               event_code = KEV_DL_LINK_ON;
+       } else if (!active_member && (sc->sc_flags & SCF_MEDIA_ACTIVE)) {
+               sc->sc_flags &= ~SCF_MEDIA_ACTIVE;
+               event_code = KEV_DL_LINK_OFF;
+       }
+
+       return event_code;
+}
+
+/*
+ * bridge_iflinkevent:
+ */
+static void
+bridge_iflinkevent(struct ifnet *ifp)
+{
+       struct bridge_softc *sc = ifp->if_bridge;
+       struct bridge_iflist *bif;
+       u_int32_t event_code = 0;
+
+#if BRIDGE_DEBUG
+       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+               printf("%s: %s\n", __func__, ifp->if_xname);
+       }
+#endif /* BRIDGE_DEBUG */
+
+       /* Check if the interface is a bridge member */
+       if (sc == NULL) {
+               return;
+       }
+
+       BRIDGE_LOCK(sc);
+       bif = bridge_lookup_member_if(sc, ifp);
+       if (bif != NULL) {
+               if (interface_media_active(ifp)) {
+                       bif->bif_flags |= BIFF_MEDIA_ACTIVE;
+               } else {
+                       bif->bif_flags &= ~BIFF_MEDIA_ACTIVE;
+               }
+
+               event_code = bridge_updatelinkstatus(sc);
+       }
+       BRIDGE_UNLOCK(sc);
+
+       if (event_code != 0) {
+               bridge_link_event(sc->sc_ifp, event_code);
+       }
+}
+
+/*
+ * bridge_delayed_callback:
+ *
+ *     Makes a delayed call
+ */
+static void
+bridge_delayed_callback(void *param)
+{
+       struct bridge_delayed_call *call = (struct bridge_delayed_call *)param;
+       struct bridge_softc *sc = call->bdc_sc;
+
+#if BRIDGE_DEBUG_DELAYED_CALLBACK
+       if (bridge_delayed_callback_delay > 0) {
+               struct timespec ts;
+
+               ts.tv_sec = bridge_delayed_callback_delay;
+               ts.tv_nsec = 0;
+
+               printf("%s: sleeping for %d seconds\n",
+                   __func__, bridge_delayed_callback_delay);
+
+               msleep(&bridge_delayed_callback_delay, NULL, PZERO,
+                   __func__, &ts);
+
+               printf("%s: awoken\n", __func__);
+       }
+#endif /* BRIDGE_DEBUG_DELAYED_CALLBACK */
+
+       BRIDGE_LOCK(sc);
+
+#if BRIDGE_DEBUG_DELAYED_CALLBACK
+       if (if_bridge_debug & BR_DBGF_DELAYED_CALL) {
+               printf("%s: %s call 0x%llx flags 0x%x\n", __func__,
+                   sc->sc_if_xname, (uint64_t)VM_KERNEL_ADDRPERM(call),
+                   call->bdc_flags);
+       }
+#endif /* BRIDGE_DEBUG_DELAYED_CALLBACK */
+
+       if (call->bdc_flags & BDCF_CANCELLING) {
+               wakeup(call);
+       } else {
+               if ((sc->sc_flags & SCF_DETACHING) == 0) {
+                       (*call->bdc_func)(sc);
+               }
+       }
+       call->bdc_flags &= ~BDCF_OUTSTANDING;
+       BRIDGE_UNLOCK(sc);
+}
+
+/*
+ * bridge_schedule_delayed_call:
+ *
+ *     Schedule a function to be called on a separate thread
+ *      The actual call may be scheduled to run at a given time or ASAP.
+ */
+static void
+bridge_schedule_delayed_call(struct bridge_delayed_call *call)
+{
+       uint64_t deadline = 0;
+       struct bridge_softc *sc = call->bdc_sc;
+
+       BRIDGE_LOCK_ASSERT_HELD(sc);
+
+       if ((sc->sc_flags & SCF_DETACHING) ||
+           (call->bdc_flags & (BDCF_OUTSTANDING | BDCF_CANCELLING))) {
+               return;
+       }
+
+       if (call->bdc_ts.tv_sec || call->bdc_ts.tv_nsec) {
+               nanoseconds_to_absolutetime(
+                       (uint64_t)call->bdc_ts.tv_sec * NSEC_PER_SEC +
+                       call->bdc_ts.tv_nsec, &deadline);
+               clock_absolutetime_interval_to_deadline(deadline, &deadline);
+       }
+
+       call->bdc_flags = BDCF_OUTSTANDING;
+
+#if BRIDGE_DEBUG_DELAYED_CALLBACK
+       if (if_bridge_debug & BR_DBGF_DELAYED_CALL) {
+               printf("%s: %s call 0x%llx flags 0x%x\n", __func__,
+                   sc->sc_if_xname, (uint64_t)VM_KERNEL_ADDRPERM(call),
+                   call->bdc_flags);
+       }
+#endif /* BRIDGE_DEBUG_DELAYED_CALLBACK */
+
+       if (call->bdc_ts.tv_sec || call->bdc_ts.tv_nsec) {
+               thread_call_func_delayed(
+                       (thread_call_func_t)bridge_delayed_callback,
+                       call, deadline);
+       } else {
+               if (call->bdc_thread_call == NULL) {
+                       call->bdc_thread_call = thread_call_allocate(
+                               (thread_call_func_t)bridge_delayed_callback,
+                               call);
+               }
+               thread_call_enter(call->bdc_thread_call);
+       }
+}
+
+/*
+ * bridge_cancel_delayed_call:
+ *
+ *     Cancel a queued or running delayed call.
+ *     If call is running, does not return until the call is done to
+ *     prevent race condition with the brigde interface getting destroyed
+ */
+static void
+bridge_cancel_delayed_call(struct bridge_delayed_call *call)
+{
+       boolean_t result;
+       struct bridge_softc *sc = call->bdc_sc;
+
+       /*
+        * The call was never scheduled
+        */
+       if (sc == NULL) {
+               return;
+       }
+
+       BRIDGE_LOCK_ASSERT_HELD(sc);
+
+       call->bdc_flags |= BDCF_CANCELLING;
+
+       while (call->bdc_flags & BDCF_OUTSTANDING) {
+#if BRIDGE_DEBUG
+               if (if_bridge_debug & BR_DBGF_DELAYED_CALL) {
+                       printf("%s: %s call 0x%llx flags 0x%x\n", __func__,
+                           sc->sc_if_xname, (uint64_t)VM_KERNEL_ADDRPERM(call),
+                           call->bdc_flags);
+               }
+#endif /* BRIDGE_DEBUG */
+               result = thread_call_func_cancel(
+                       (thread_call_func_t)bridge_delayed_callback, call, FALSE);
+
+               if (result) {
+                       /*
+                        * We managed to dequeue the delayed call
+                        */
+                       call->bdc_flags &= ~BDCF_OUTSTANDING;
+               } else {
+                       /*
+                        * Wait for delayed call do be done running
+                        */
+                       msleep(call, &sc->sc_mtx, PZERO, __func__, NULL);
+               }
+       }
+       call->bdc_flags &= ~BDCF_CANCELLING;
+}
+
+/*
+ * bridge_cleanup_delayed_call:
+ *
+ *     Dispose resource allocated for a delayed call
+ *     Assume the delayed call is not queued or running .
+ */
+static void
+bridge_cleanup_delayed_call(struct bridge_delayed_call *call)
+{
+       boolean_t result;
+       struct bridge_softc *sc = call->bdc_sc;
+
+       /*
+        * The call was never scheduled
+        */
+       if (sc == NULL) {
+               return;
+       }
+
+       BRIDGE_LOCK_ASSERT_HELD(sc);
+
+       VERIFY((call->bdc_flags & BDCF_OUTSTANDING) == 0);
+       VERIFY((call->bdc_flags & BDCF_CANCELLING) == 0);
+
+       if (call->bdc_thread_call != NULL) {
+               result = thread_call_free(call->bdc_thread_call);
+               if (result == FALSE) {
+                       panic("%s thread_call_free() failed for call %p",
+                           __func__, call);
+               }
+               call->bdc_thread_call = NULL;
        }
        }
-       lck_mtx_unlock(bridge_list_mtx);
 }
 
 /*
 }
 
 /*
@@ -2834,25 +3726,27 @@ static int
 bridge_init(struct ifnet *ifp)
 {
        struct bridge_softc *sc = (struct bridge_softc *)ifp->if_softc;
 bridge_init(struct ifnet *ifp)
 {
        struct bridge_softc *sc = (struct bridge_softc *)ifp->if_softc;
-       struct timespec ts;
        errno_t error;
 
        errno_t error;
 
-       BRIDGE_LOCK_ASSERT(sc);
-
-       if ((ifnet_flags(ifp) & IFF_RUNNING))
-               return (0);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
 
-       ts.tv_sec = bridge_rtable_prune_period;
-       ts.tv_nsec = 0;
-       bsd_timeout(bridge_timer, sc, &ts);
+       if ((ifnet_flags(ifp) & IFF_RUNNING)) {
+               return 0;
+       }
 
        error = ifnet_set_flags(ifp, IFF_RUNNING, IFF_RUNNING);
 
        error = ifnet_set_flags(ifp, IFF_RUNNING, IFF_RUNNING);
+
+       /*
+        * Calling bridge_aging_timer() is OK as there are no entries to
+        * age so we're just going to arm the timer
+        */
+       bridge_aging_timer(sc);
 #if BRIDGESTP
 #if BRIDGESTP
-       if (error == 0)
-               bstp_init(&sc->sc_stp);         /* Initialize Spanning Tree */
+       if (error == 0) {
+               bstp_init(&sc->sc_stp); /* Initialize Spanning Tree */
+       }
 #endif /* BRIDGESTP */
 #endif /* BRIDGESTP */
-
-       return (error);
+       return error;
 }
 
 /*
 }
 
 /*
@@ -2861,25 +3755,81 @@ bridge_init(struct ifnet *ifp)
  *     Stop the bridge interface.
  */
 static void
  *     Stop the bridge interface.
  */
 static void
-bridge_ifstop(struct ifnet *ifp, __unused int disable)
+bridge_ifstop(struct ifnet *ifp, int disable)
 {
 {
+#pragma unused(disable)
        struct bridge_softc *sc = ifp->if_softc;
 
        struct bridge_softc *sc = ifp->if_softc;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
 
-       if ((ifnet_flags(ifp) & IFF_RUNNING) == 0)
+       if ((ifnet_flags(ifp) & IFF_RUNNING) == 0) {
                return;
                return;
+       }
+
+       bridge_cancel_delayed_call(&sc->sc_aging_timer);
 
 
-       bsd_untimeout(bridge_timer, sc);
 #if BRIDGESTP
        bstp_stop(&sc->sc_stp);
 #endif /* BRIDGESTP */
 
        bridge_rtflush(sc, IFBF_FLUSHDYN);
 #if BRIDGESTP
        bstp_stop(&sc->sc_stp);
 #endif /* BRIDGESTP */
 
        bridge_rtflush(sc, IFBF_FLUSHDYN);
-
        (void) ifnet_set_flags(ifp, 0, IFF_RUNNING);
 }
 
        (void) ifnet_set_flags(ifp, 0, IFF_RUNNING);
 }
 
+/*
+ * bridge_compute_cksum:
+ *
+ *     If the packet has checksum flags, compare the hardware checksum
+ *     capabilities of the source and destination interfaces. If they
+ *     are the same, there's nothing to do. If they are different,
+ *     finalize the checksum so that it can be sent on the destination
+ *     interface.
+ */
+static void
+bridge_compute_cksum(struct ifnet *src_if, struct ifnet *dst_if, struct mbuf *m)
+{
+       uint32_t csum_flags;
+       uint16_t dst_hw_csum;
+       uint32_t did_sw;
+       struct ether_header *eh;
+       uint16_t src_hw_csum;
+
+       csum_flags = m->m_pkthdr.csum_flags & IF_HWASSIST_CSUM_MASK;
+       if (csum_flags == 0) {
+               /* no checksum offload */
+               return;
+       }
+
+       /*
+        * if destination/source differ in checksum offload
+        * capabilities, finalize/compute the checksum
+        */
+       dst_hw_csum = IF_HWASSIST_CSUM_FLAGS(dst_if->if_hwassist);
+       src_hw_csum = IF_HWASSIST_CSUM_FLAGS(src_if->if_hwassist);
+       if (dst_hw_csum == src_hw_csum) {
+               return;
+       }
+       eh = mtod(m, struct ether_header *);
+       switch (ntohs(eh->ether_type)) {
+       case ETHERTYPE_IP:
+               did_sw = in_finalize_cksum(m, sizeof(*eh), csum_flags);
+               break;
+#if INET6
+       case ETHERTYPE_IPV6:
+               did_sw = in6_finalize_cksum(m, sizeof(*eh), -1, -1, csum_flags);
+               break;
+#endif /* INET6 */
+       }
+#if BRIDGE_DEBUG
+       if (if_bridge_debug & BR_DBGF_CHECKSUM) {
+               printf("%s: [%s -> %s] before 0x%x did 0x%x after 0x%x\n",
+                   __func__,
+                   src_if->if_xname, dst_if->if_xname, csum_flags, did_sw,
+                   m->m_pkthdr.csum_flags);
+       }
+#endif /* BRIDGE_DEBUG */
+}
+
 /*
  * bridge_enqueue:
  *
 /*
  * bridge_enqueue:
  *
@@ -2887,11 +3837,11 @@ bridge_ifstop(struct ifnet *ifp, __unused int disable)
  *
  */
 static int
  *
  */
 static int
-bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
+bridge_enqueue(struct bridge_softc *sc, struct ifnet *src_ifp,
+    struct ifnet *dst_ifp, struct mbuf *m, ChecksumOperation cksum_op)
 {
        int len, error = 0;
 {
        int len, error = 0;
-       short mflags;
-       struct mbuf *m0;
+       struct mbuf *next_m;
 
        VERIFY(dst_ifp != NULL);
 
 
        VERIFY(dst_ifp != NULL);
 
@@ -2900,17 +3850,30 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
         *
         * NOTE: bridge_fragment() is called only when PFIL_HOOKS is enabled.
         */
         *
         * NOTE: bridge_fragment() is called only when PFIL_HOOKS is enabled.
         */
-       for (; m; m = m0) {
+       for (; m; m = next_m) {
                errno_t _error;
                errno_t _error;
-               struct flowadv adv = { FADV_SUCCESS };
+               struct flowadv adv = { .code = FADV_SUCCESS };
 
 
-               m0 = m->m_nextpkt;
+               next_m = m->m_nextpkt;
                m->m_nextpkt = NULL;
 
                len = m->m_pkthdr.len;
                m->m_nextpkt = NULL;
 
                len = m->m_pkthdr.len;
-               mflags = m->m_flags;
                m->m_flags |= M_PROTO1; /* set to avoid loops */
 
                m->m_flags |= M_PROTO1; /* set to avoid loops */
 
+               switch (cksum_op) {
+               case kChecksumOperationClear:
+                       m->m_pkthdr.csum_flags = 0;
+                       break;
+               case kChecksumOperationFinalize:
+                       /* the checksum might not be correct, finalize now */
+                       bridge_finalize_cksum(dst_ifp, m);
+                       break;
+               case kChecksumOperationCompute:
+                       bridge_compute_cksum(src_ifp, dst_ifp, m);
+                       break;
+               default:
+                       break;
+               }
 #if HAS_IF_CAP
                /*
                 * If underlying interface can not do VLAN tag insertion itself
 #if HAS_IF_CAP
                /*
                 * If underlying interface can not do VLAN tag insertion itself
@@ -2920,9 +3883,8 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
                    (dst_ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0) {
                        m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
                        if (m == NULL) {
                    (dst_ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0) {
                        m = ether_vlanencap(m, m->m_pkthdr.ether_vtag);
                        if (m == NULL) {
-                               printf("%s: %s%d: unable to prepend VLAN "
-                                   "header\n", __func__, ifnet_name(dst_ifp),
-                                   ifnet_unit(dst_ifp));
+                               printf("%s: %s: unable to prepend VLAN "
+                                   "header\n", __func__, dst_ifp->if_xname);
                                (void) ifnet_stat_increment_out(dst_ifp,
                                    0, 0, 1);
                                continue;
                                (void) ifnet_stat_increment_out(dst_ifp,
                                    0, 0, 1);
                                continue;
@@ -2935,12 +3897,13 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
 
                /* Preserve existing error value */
                if (error == 0) {
 
                /* Preserve existing error value */
                if (error == 0) {
-                       if (_error != 0)
+                       if (_error != 0) {
                                error = _error;
                                error = _error;
-                       else if (adv.code == FADV_FLOW_CONTROLLED)
+                       } else if (adv.code == FADV_FLOW_CONTROLLED) {
                                error = EQFULL;
                                error = EQFULL;
-                       else if (adv.code == FADV_SUSPENDED)
+                       } else if (adv.code == FADV_SUSPENDED) {
                                error = EQSUSPENDED;
                                error = EQSUSPENDED;
+                       }
                }
 
                if (_error == 0) {
                }
 
                if (_error == 0) {
@@ -2950,7 +3913,7 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m)
                }
        }
 
                }
        }
 
-       return (error);
+       return error;
 }
 
 #if HAS_BRIDGE_DUMMYNET
 }
 
 #if HAS_BRIDGE_DUMMYNET
@@ -2970,7 +3933,7 @@ bridge_dummynet(struct mbuf *m, struct ifnet *ifp)
        sc = ifp->if_bridge;
 
        /*
        sc = ifp->if_bridge;
 
        /*
-        * The packet didnt originate from a member interface. This should only
+        * The packet didn't originate from a member interface. This should only
         * ever happen if a member interface is removed while packets are
         * queued for it.
         */
         * ever happen if a member interface is removed while packets are
         * queued for it.
         */
@@ -2979,22 +3942,19 @@ bridge_dummynet(struct mbuf *m, struct ifnet *ifp)
                return;
        }
 
                return;
        }
 
-       if (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
-           || PFIL_HOOKED(&inet6_pfil_hook)
-#endif
-           ) {
-               if (bridge_pfil(&m, sc->sc_ifp, ifp, PFIL_OUT) != 0)
+       if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
+               if (bridge_pfil(&m, sc->sc_ifp, ifp, PFIL_OUT) != 0) {
                        return;
                        return;
-               if (m == NULL)
+               }
+               if (m == NULL) {
                        return;
                        return;
+               }
        }
 
        }
 
-       (void) bridge_enqueue(sc, ifp, m);
+       (void) bridge_enqueue(sc, NULL, ifp, m, kChecksumOperationNone);
 }
 #endif /* HAS_BRIDGE_DUMMYNET */
 
 }
 #endif /* HAS_BRIDGE_DUMMYNET */
 
-#if BRIDGE_MEMBER_OUT_FILTER
 /*
  * bridge_member_output:
  *
 /*
  * bridge_member_output:
  *
@@ -3002,32 +3962,29 @@ bridge_dummynet(struct mbuf *m, struct ifnet *ifp)
  *     performs the bridging function for locally originated
  *     packets.
  *
  *     performs the bridging function for locally originated
  *     packets.
  *
- *     The mbuf has the Ethernet header already attached.  We must
- *     enqueue or free the mbuf before returning.
+ *     The mbuf has the Ethernet header already attached.
  */
  */
-static int
-bridge_member_output(struct ifnet *ifp, struct mbuf *m,
-    __unused struct sockaddr *sa, __unused struct rtentry *rt)
+static errno_t
+bridge_member_output(struct bridge_softc *sc, ifnet_t ifp, mbuf_t m)
 {
        struct ether_header *eh;
        struct ifnet *dst_if;
 {
        struct ether_header *eh;
        struct ifnet *dst_if;
-       struct bridge_softc *sc;
        uint16_t vlan;
 
 #if BRIDGE_DEBUG
        uint16_t vlan;
 
 #if BRIDGE_DEBUG
-       if (if_bridge_debug)
-               printf("%s: ifp %p %s%d\n", __func__, ifp, ifnet_name(ifp),
-                   ifnet_unit(ifp));
+       if (if_bridge_debug & BR_DBGF_OUTPUT) {
+               printf("%s: ifp %s\n", __func__, ifp->if_xname);
+       }
 #endif /* BRIDGE_DEBUG */
 
        if (m->m_len < ETHER_HDR_LEN) {
                m = m_pullup(m, ETHER_HDR_LEN);
 #endif /* BRIDGE_DEBUG */
 
        if (m->m_len < ETHER_HDR_LEN) {
                m = m_pullup(m, ETHER_HDR_LEN);
-               if (m == NULL)
-                       return (0);
+               if (m == NULL) {
+                       return ENOBUFS;
+               }
        }
 
        eh = mtod(m, struct ether_header *);
        }
 
        eh = mtod(m, struct ether_header *);
-       sc = ifp->if_bridge;
        vlan = VLANTAGOF(m);
 
        BRIDGE_LOCK(sc);
        vlan = VLANTAGOF(m);
 
        BRIDGE_LOCK(sc);
@@ -3056,30 +4013,39 @@ bridge_member_output(struct ifnet *ifp, struct mbuf *m,
         * If the packet is a multicast, or we don't know a better way to
         * get there, send to all interfaces.
         */
         * If the packet is a multicast, or we don't know a better way to
         * get there, send to all interfaces.
         */
-       if (ETHER_IS_MULTICAST(eh->ether_dhost))
+       if (ETHER_IS_MULTICAST(eh->ether_dhost)) {
                dst_if = NULL;
                dst_if = NULL;
-       else
+       } else {
                dst_if = bridge_rtlookup(sc, eh->ether_dhost, vlan);
                dst_if = bridge_rtlookup(sc, eh->ether_dhost, vlan);
+       }
        if (dst_if == NULL) {
                struct bridge_iflist *bif;
                struct mbuf *mc;
        if (dst_if == NULL) {
                struct bridge_iflist *bif;
                struct mbuf *mc;
-               int error = 0, used = 0;
+               int used = 0;
+               errno_t error;
+
 
                bridge_span(sc, m);
 
                BRIDGE_LOCK2REF(sc, error);
 
                bridge_span(sc, m);
 
                BRIDGE_LOCK2REF(sc, error);
-               if (error) {
+               if (error != 0) {
                        m_freem(m);
                        m_freem(m);
-                       return (0);
+                       return error;
                }
 
                TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
                }
 
                TAILQ_FOREACH(bif, &sc->sc_iflist, bif_next) {
+                       /* skip interface with inactive link status */
+                       if ((bif->bif_flags & BIFF_MEDIA_ACTIVE) == 0) {
+                               continue;
+                       }
                        dst_if = bif->bif_ifp;
 
                        dst_if = bif->bif_ifp;
 
-                       if (dst_if->if_type == IFT_GIF)
+                       if (dst_if->if_type == IFT_GIF) {
                                continue;
                                continue;
-                       if ((dst_if->if_flags & IFF_RUNNING) == 0)
+                       }
+                       if ((dst_if->if_flags & IFF_RUNNING) == 0) {
                                continue;
                                continue;
+                       }
 
                        /*
                         * If this is not the original output interface,
 
                        /*
                         * If this is not the original output interface,
@@ -3087,342 +4053,52 @@ bridge_member_output(struct ifnet *ifp, struct mbuf *m,
                         * tree, make sure the port is in a state that
                         * allows forwarding.
                         */
                         * tree, make sure the port is in a state that
                         * allows forwarding.
                         */
-                       if (dst_if != ifp && (bif->bif_flags & IFBIF_STP) &&
-                           bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
+                       if (dst_if != ifp && (bif->bif_ifflags & IFBIF_STP) &&
+                           bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
                                continue;
                                continue;
-
-                       if (LIST_NEXT(bif, bif_next) == NULL) {
+                       }
+                       if (TAILQ_NEXT(bif, bif_next) == NULL) {
                                used = 1;
                                mc = m;
                                used = 1;
                                mc = m;
-                       } else {
-                               mc = m_copypacket(m, M_DONTWAIT);
-                               if (mc == NULL) {
-                                       (void) ifnet_stat_increment_out(
-                                           sc->sc_ifp, 0, 0, 1);
-                                       continue;
-                               }
-                       }
-
-                       (void) bridge_enqueue(sc, dst_if, mc);
-               }
-               if (used == 0)
-                       m_freem(m);
-               BRIDGE_UNREF(sc);
-               return (0);
-       }
-
-sendunicast:
-       /*
-        * XXX Spanning tree consideration here?
-        */
-
-       bridge_span(sc, m);
-       if ((dst_if->if_flags & IFF_RUNNING) == 0) {
-               m_freem(m);
-               BRIDGE_UNLOCK(sc);
-               return (0);
-       }
-
-       BRIDGE_UNLOCK(sc);
-       (void) bridge_enqueue(sc, dst_if, m);
-       return (0);
-}
-#endif /* BRIDGE_MEMBER_OUT_FILTER */
-
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
-static struct mbuf *
-bridge_fix_txcsum(struct mbuf *m)
-{
-       /*
-        * basic tests indicate that the vast majority of packets being
-        * processed here have an Ethernet header mbuf pre-pended to them
-        * (the first case below)
-        *
-        * the second highest are those where the Ethernet and IP/TCP/UDP
-        * headers are all in one mbuf (second case below)
-        *
-        * the third case has, in fact, never hit for me -- although if I
-        * comment out the first two cases, that code works for them, so I
-        * consider it a decent general solution
-        */
-       int amt = ETHER_HDR_LEN;
-       int hlen = M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data);
-       int off = M_CSUM_DATA_IPv4_OFFSET(m->m_pkthdr.csum_data);
-
-       /*
-        * NOTE we should never get vlan-attached packets here;
-        * support for those COULD be added, but we don't use them
-        * and it really kinda slows things down to worry about them
-        */
-
-#ifdef DIAGNOSTIC
-       if (m_tag_find(m, PACKET_TAG_VLAN, NULL) != NULL) {
-               printf("%s: transmitting packet tagged with VLAN?\n", __func__);
-               KASSERT(0);
-               m_freem(m);
-               return (NULL);
-       }
-#endif
-
-       if (m->m_pkthdr.csum_flags & M_CSUM_IPv4) {
-               amt += hlen;
-       }
-       if (m->m_pkthdr.csum_flags & M_CSUM_TCPv4) {
-               amt += off + sizeof (uint16_t);
-       }
-
-       if (m->m_pkthdr.csum_flags & M_CSUM_UDPv4) {
-               amt += off + sizeof (uint16_t);
-       }
-
-       if (m->m_len == ETHER_HDR_LEN) {
-               /*
-                * this is the case where there's an Ethernet header in an
-                * mbuf the first mbuf is the Ethernet header -- just strip
-                * it off and do the checksum
-                */
-               /* set up m_ip so the cksum operations work */
-               struct mbuf *m_ip = m->m_next;
-
-               /* APPLE MODIFICATION 22 Apr 2008 <mvega@apple.com>
-                *  <rdar://5817385> Clear the m_tag list before setting
-                *  M_PKTHDR.
-                *
-                *  If this m_buf chain was extended via M_PREPEND(), then
-                *  m_ip->m_pkthdr is identical to m->m_pkthdr (see
-                *  M_MOVE_PKTHDR()). The only thing preventing access to this
-                *  invalid packet header data is the fact that the M_PKTHDR
-                *  flag is clear, i.e., m_ip->m_flag & M_PKTHDR == 0, but we're
-                *  about to set the M_PKTHDR flag, so to be safe we initialize,
-                *  more accurately, we clear, m_ip->m_pkthdr.tags via
-                *  m_tag_init().
-                *
-                *  Suppose that we do not do this; if m_pullup(), below, fails,
-                *  then m_ip will be freed along with m_ip->m_pkthdr.tags, but
-                *  we will also free m soon after, via m_freem(), and
-                *  consequently attempt to free m->m_pkthdr.tags in the
-                *  process. The problem is that m->m_pkthdr.tags will have
-                *  already been freed by virtue of being equal to
-                *  m_ip->m_pkthdr.tags. Attempts to dereference
-                *  m->m_pkthdr.tags in m_tag_delete_chain() will result in a
-                *  panic.
-                */
-               m_tag_init(m_ip);
-               /* END MODIFICATION */
-               m_ip->m_flags |= M_PKTHDR;
-               m_ip->m_pkthdr.csum_flags = m->m_pkthdr.csum_flags;
-               m_ip->m_pkthdr.csum_data = m->m_pkthdr.csum_data;
-               m_ip->m_pkthdr.len = m->m_pkthdr.len - ETHER_HDR_LEN;
-
-               /*
-                * set up the header mbuf so we can prepend it
-                * back on again later
-                */
-               m->m_pkthdr.csum_flags = 0;
-               m->m_pkthdr.csum_data = 0;
-               m->m_pkthdr.len = ETHER_HDR_LEN;
-               m->m_next = NULL;
-
-               /* now do the checksums we need -- first IP */
-               if (m_ip->m_pkthdr.csum_flags & M_CSUM_IPv4) {
-                       /*
-                        * make sure the IP header (or at least the part with
-                        * the cksum) is there
-                        */
-                       m_ip = m_pullup(m_ip, sizeof (struct ip));
-                       if (m_ip == NULL) {
-                               printf("%s: failed to flatten header\n",
-                                   __func__);
-                               m_freem(m);
-                               return (NULL);
-                       }
-
-                       /* now do the checksum */
-                       {
-                               struct ip *ip = mtod(m_ip, struct ip *);
-                               ip->ip_sum = in_cksum(m_ip, hlen);
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
-                               printf("%s: performed IPv4 checksum\n",
-                                   __func__);
-#endif
-                       }
-               }
-
-               /* now do a TCP or UDP delayed checksum */
-               if (m_ip->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4)) {
-                       in_delayed_cksum(m_ip);
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
-                       printf("%s: performed TCPv4/UDPv4 checksum\n",
-                           __func__);
-#endif
-               }
-
-               /* now attach the ethernet header back onto the IP packet */
-               m->m_next = m_ip;
-               m->m_pkthdr.len += m_length(m_ip);
-
-               /*
-                * clear the M_PKTHDR flags on the ip packet (again,
-                * we re-attach later)
-                */
-               m_ip->m_flags &= ~M_PKTHDR;
-
-               /* and clear any csum flags */
-               m->m_pkthdr.csum_flags &=
-                   ~(M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4);
-       } else if (m->m_len >= amt) {
-               /*
-                * everything fits in the first mbuf, so futz with
-                * m->m_data, m->m_len and m->m_pkthdr.len to make it work
-                */
-               m->m_len -= ETHER_HDR_LEN;
-               m->m_data += ETHER_HDR_LEN;
-               m->m_pkthdr.len -= ETHER_HDR_LEN;
-
-               /* now do the checksums we need -- first IP */
-               if (m->m_pkthdr.csum_flags & M_CSUM_IPv4) {
-                       struct ip *ip = mtod(m, struct ip *);
-                       ip->ip_sum = in_cksum(m, hlen);
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
-                       printf("%s: performed IPv4 checksum\n", __func__);
-#endif
-               }
-
-               // now do a TCP or UDP delayed checksum
-               if (m->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4)) {
-                       in_delayed_cksum(m);
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
-                       printf("%s: performed TCPv4/UDPv4 checksum\n",
-                           __func__);
-#endif
-               }
-
-               /* now stick the ethernet header back on */
-               m->m_len += ETHER_HDR_LEN;
-               m->m_data -= ETHER_HDR_LEN;
-               m->m_pkthdr.len += ETHER_HDR_LEN;
-
-               /* and clear any csum flags */
-               m->m_pkthdr.csum_flags &=
-                   ~(M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4);
-       } else {
-               struct mbuf *m_ip;
-
-               /*
-                * general case -- need to simply split it off and deal
-                * first, calculate how much needs to be made writable
-                * (we may have a read-only mbuf here)
-                */
-               hlen = M_CSUM_DATA_IPv4_IPHL(m->m_pkthdr.csum_data);
-#if PARANOID
-               off = M_CSUM_DATA_IPv4_OFFSET(m->m_pkthdr.csum_data);
-
-               if (m->m_pkthdr.csum_flags & M_CSUM_IPv4) {
-                       amt += hlen;
-               }
-
-               if (m->m_pkthdr.csum_flags & M_CSUM_TCPv4) {
-                       amt += sizeof (struct tcphdr *);
-                       amt += off;
-               }
-
-               if (m->m_pkthdr.csum_flags & M_CSUM_UDPv4) {
-                       amt += sizeof (struct udphdr *);
-                       amt += off;
-               }
-#endif
-
-               /*
-                * now split the ethernet header off of the IP packet
-                * (we'll re-attach later)
-                */
-               m_ip = m_split(m, ETHER_HDR_LEN, M_NOWAIT);
-               if (m_ip == NULL) {
-                       printf("%s: could not split ether header\n", __func__);
-
-                       m_freem(m);
-                       return (NULL);
-               }
-
-#if PARANOID
-               /*
-                * make sure that the IP packet is writable
-                * for the portion we need
-                */
-               if (m_makewritable(&m_ip, 0, amt, M_DONTWAIT) != 0) {
-                       printf("%s: could not make %d bytes writable\n",
-                           __func__, amt);
-
-                       m_freem(m);
-                       m_freem(m_ip);
-                       return (NULL);
-               }
-#endif
-
-               m_ip->m_pkthdr.csum_flags = m->m_pkthdr.csum_flags;
-               m_ip->m_pkthdr.csum_data = m->m_pkthdr.csum_data;
-
-               m->m_pkthdr.csum_flags = 0;
-               m->m_pkthdr.csum_data = 0;
-
-               /* now do the checksums we need -- first IP */
-               if (m_ip->m_pkthdr.csum_flags & M_CSUM_IPv4) {
-                       /*
-                        * make sure the IP header (or at least the part
-                        * with the cksum) is there
-                        */
-                       m_ip = m_pullup(m_ip, sizeof (struct ip));
-                       if (m_ip == NULL) {
-                               printf("%s: failed to flatten header\n",
-                                   __func__);
-                               m_freem(m);
-                               return (NULL);
-                       }
-
-                       /* now do the checksum */
-                       {
-                               struct ip *ip = mtod(m_ip, struct ip *);
-                               ip->ip_sum = in_cksum(m_ip, hlen);
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
-                               printf("%s: performed IPv4 checksum\n",
-                                   __func__);
-#endif
+                       } else {
+                               mc = m_dup(m, M_DONTWAIT);
+                               if (mc == NULL) {
+                                       (void) ifnet_stat_increment_out(
+                                               sc->sc_ifp, 0, 0, 1);
+                                       continue;
+                               }
                        }
                        }
+                       (void) bridge_enqueue(sc, ifp, dst_if, mc,
+                           kChecksumOperationCompute);
                }
                }
-
-               /* now do a TCP or UDP delayed checksum */
-               if (m_ip->m_pkthdr.csum_flags & (M_CSUM_TCPv4|M_CSUM_UDPv4)) {
-                       in_delayed_cksum(m_ip);
-
-#ifdef VERY_VERY_VERY_DIAGNOSTIC
-                       printf("%s: performed TCPv4/UDPv4 checksum\n",
-                           __func__);
-#endif
+               if (used == 0) {
+                       m_freem(m);
                }
                }
+               BRIDGE_UNREF(sc);
+               return EJUSTRETURN;
+       }
 
 
-               // now attach the ethernet header back onto the IP packet
-               m->m_next = m_ip;
-               m->m_pkthdr.len += m_length(m_ip);
-
-               /*
-                * clear the M_PKTHDR flags on the ip packet
-                * (again, we re-attach later)
-                */
-               m_ip->m_flags &= ~M_PKTHDR;
+sendunicast:
+       /*
+        * XXX Spanning tree consideration here?
+        */
 
 
-               /* and clear any csum flags */
-               m->m_pkthdr.csum_flags &=
-                   ~(M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4);
+       bridge_span(sc, m);
+       if ((dst_if->if_flags & IFF_RUNNING) == 0) {
+               m_freem(m);
+               BRIDGE_UNLOCK(sc);
+               return EJUSTRETURN;
        }
 
        }
 
-       return (m);
+       BRIDGE_UNLOCK(sc);
+       if (dst_if == ifp) {
+               /* just let the packet continue on its way */
+               return 0;
+       }
+       (void) bridge_enqueue(sc, ifp, dst_if, m,
+           kChecksumOperationCompute);
+       return EJUSTRETURN;
 }
 }
-#endif
 
 /*
  * Output callback.
 
 /*
  * Output callback.
@@ -3442,52 +4118,92 @@ bridge_output(struct ifnet *ifp, struct mbuf *m)
        dst_if = NULL;
 
        BRIDGE_LOCK(sc);
        dst_if = NULL;
 
        BRIDGE_LOCK(sc);
-       if (!(m->m_flags & (M_BCAST|M_MCAST))) {
-               dst_if = bridge_rtlookup(sc, eh->ether_dhost, 0);
-       }
 
 
-#if APPLE_BRIDGE_HWCKSUM_SUPPORT
-       /*
-        * APPLE MODIFICATION - if the packet needs a checksum
-        * (i.e., checksum has been deferred for HW support)
-        * AND the destination interface doesn't support HW
-        * checksums, then we need to fix-up the checksum here
-        */
-       if ((m->m_pkthdr.csum_flags &
-           (M_CSUM_TCPv4|M_CSUM_UDPv4|M_CSUM_IPv4)) &&
-           (dst_if == NULL ||
-           (dst_if->if_csum_flags_tx & m->m_pkthdr.csum_flags) !=
-           m->m_pkthdr.csum_flags)) {
-               m = bridge_fix_txcsum(m);
-               if (m == NULL) {
-                       BRIDGE_UNLOCK(sc);
-                       return (0);
-               }
+       if (!(m->m_flags & (M_BCAST | M_MCAST))) {
+               dst_if = bridge_rtlookup(sc, eh->ether_dhost, 0);
        }
        }
-#else
-       if (eh->ether_type == htons(ETHERTYPE_IP))
-               mbuf_outbound_finalize(m, PF_INET, sizeof (*eh));
-       else
-               m->m_pkthdr.csum_flags = 0;
-#endif /* APPLE_BRIDGE_HWCKSUM_SUPPORT */
 
 
-       atomic_add_64(&ifp->if_obytes, m->m_pkthdr.len);
-       atomic_add_64(&ifp->if_opackets, 1);
+       (void) ifnet_stat_increment_out(ifp, 1, m->m_pkthdr.len, 0);
 
 #if NBPFILTER > 0
 
 #if NBPFILTER > 0
-       if (sc->sc_bpf_output)
+       if (sc->sc_bpf_output) {
                bridge_bpf_output(ifp, m);
                bridge_bpf_output(ifp, m);
+       }
 #endif
 
        if (dst_if == NULL) {
                /* callee will unlock */
 #endif
 
        if (dst_if == NULL) {
                /* callee will unlock */
-               bridge_broadcast(sc, ifp, m, 0);
+               bridge_broadcast(sc, NULL, m, 0);
        } else {
                BRIDGE_UNLOCK(sc);
        } else {
                BRIDGE_UNLOCK(sc);
-               error = bridge_enqueue(sc, dst_if, m);
+               error = bridge_enqueue(sc, NULL, dst_if, m,
+                   kChecksumOperationFinalize);
+       }
+
+       return error;
+}
+
+static void
+bridge_finalize_cksum(struct ifnet *ifp, struct mbuf *m)
+{
+       struct ether_header *eh = mtod(m, struct ether_header *);
+       uint32_t sw_csum, hwcap;
+
+
+       if (ifp != NULL) {
+               hwcap = (ifp->if_hwassist | CSUM_DATA_VALID);
+       } else {
+               hwcap = 0;
        }
 
        }
 
-       return (error);
+       /* do in software what the hardware cannot */
+       sw_csum = m->m_pkthdr.csum_flags & ~IF_HWASSIST_CSUM_FLAGS(hwcap);
+       sw_csum &= IF_HWASSIST_CSUM_MASK;
+
+       switch (ntohs(eh->ether_type)) {
+       case ETHERTYPE_IP:
+               if ((hwcap & CSUM_PARTIAL) && !(sw_csum & CSUM_DELAY_DATA) &&
+                   (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)) {
+                       if (m->m_pkthdr.csum_flags & CSUM_TCP) {
+                               uint16_t start =
+                                   sizeof(*eh) + sizeof(struct ip);
+                               uint16_t ulpoff =
+                                   m->m_pkthdr.csum_data & 0xffff;
+                               m->m_pkthdr.csum_flags |=
+                                   (CSUM_DATA_VALID | CSUM_PARTIAL);
+                               m->m_pkthdr.csum_tx_stuff = (ulpoff + start);
+                               m->m_pkthdr.csum_tx_start = start;
+                       } else {
+                               sw_csum |= (CSUM_DELAY_DATA &
+                                   m->m_pkthdr.csum_flags);
+                       }
+               }
+               (void) in_finalize_cksum(m, sizeof(*eh), sw_csum);
+               break;
+
+#if INET6
+       case ETHERTYPE_IPV6:
+               if ((hwcap & CSUM_PARTIAL) &&
+                   !(sw_csum & CSUM_DELAY_IPV6_DATA) &&
+                   (m->m_pkthdr.csum_flags & CSUM_DELAY_IPV6_DATA)) {
+                       if (m->m_pkthdr.csum_flags & CSUM_TCPIPV6) {
+                               uint16_t start =
+                                   sizeof(*eh) + sizeof(struct ip6_hdr);
+                               uint16_t ulpoff =
+                                   m->m_pkthdr.csum_data & 0xffff;
+                               m->m_pkthdr.csum_flags |=
+                                   (CSUM_DATA_VALID | CSUM_PARTIAL);
+                               m->m_pkthdr.csum_tx_stuff = (ulpoff + start);
+                               m->m_pkthdr.csum_tx_start = start;
+                       } else {
+                               sw_csum |= (CSUM_DELAY_IPV6_DATA &
+                                   m->m_pkthdr.csum_flags);
+                       }
+               }
+               (void) in6_finalize_cksum(m, sizeof(*eh), -1, -1, sw_csum);
+               break;
+#endif /* INET6 */
+       }
 }
 
 /*
 }
 
 /*
@@ -3508,8 +4224,9 @@ bridge_start(struct ifnet *ifp)
        struct mbuf *m;
 
        for (;;) {
        struct mbuf *m;
 
        for (;;) {
-               if (ifnet_dequeue(ifp, &m) != 0)
+               if (ifnet_dequeue(ifp, &m) != 0) {
                        break;
                        break;
+               }
 
                (void) bridge_output(ifp, m);
        }
 
                (void) bridge_output(ifp, m);
        }
@@ -3533,12 +4250,13 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
        uint8_t *dst;
        int error;
 
        uint8_t *dst;
        int error;
 
-       lck_mtx_assert(sc->sc_mtx, LCK_MTX_ASSERT_OWNED);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
 #if BRIDGE_DEBUG
 
 #if BRIDGE_DEBUG
-       if (if_bridge_debug)
-               printf("%s: %s%d m%p\n", __func__, ifnet_name(sc->sc_ifp),
-                   ifnet_unit(sc->sc_ifp), m);
+       if (if_bridge_debug & BR_DBGF_OUTPUT) {
+               printf("%s: %s m 0x%llx\n", __func__, sc->sc_ifp->if_xname,
+                   (uint64_t)VM_KERNEL_ADDRPERM(m));
+       }
 #endif /* BRIDGE_DEBUG */
 
        src_if = m->m_pkthdr.rcvif;
 #endif /* BRIDGE_DEBUG */
 
        src_if = m->m_pkthdr.rcvif;
@@ -3548,28 +4266,31 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
        vlan = VLANTAGOF(m);
 
 
        vlan = VLANTAGOF(m);
 
 
-       if ((sbif->bif_flags & IFBIF_STP) &&
-           sbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
+       if ((sbif->bif_ifflags & IFBIF_STP) &&
+           sbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
                goto drop;
                goto drop;
+       }
 
        eh = mtod(m, struct ether_header *);
        dst = eh->ether_dhost;
 
        /* If the interface is learning, record the address. */
 
        eh = mtod(m, struct ether_header *);
        dst = eh->ether_dhost;
 
        /* If the interface is learning, record the address. */
-       if (sbif->bif_flags & IFBIF_LEARNING) {
+       if (sbif->bif_ifflags & IFBIF_LEARNING) {
                error = bridge_rtupdate(sc, eh->ether_shost, vlan,
                    sbif, 0, IFBAF_DYNAMIC);
                /*
                 * If the interface has addresses limits then deny any source
                 * that is not in the cache.
                 */
                error = bridge_rtupdate(sc, eh->ether_shost, vlan,
                    sbif, 0, IFBAF_DYNAMIC);
                /*
                 * If the interface has addresses limits then deny any source
                 * that is not in the cache.
                 */
-               if (error && sbif->bif_addrmax)
+               if (error && sbif->bif_addrmax) {
                        goto drop;
                        goto drop;
+               }
        }
 
        }
 
-       if ((sbif->bif_flags & IFBIF_STP) != 0 &&
-           sbif->bif_stp.bp_state == BSTP_IFSTATE_LEARNING)
+       if ((sbif->bif_ifflags & IFBIF_STP) != 0 &&
+           sbif->bif_stp.bp_state == BSTP_IFSTATE_LEARNING) {
                goto drop;
                goto drop;
+       }
 
        /*
         * At this point, the port either doesn't participate
 
        /*
         * At this point, the port either doesn't participate
@@ -3580,11 +4301,15 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
         * If the packet is unicast, destined for someone on
         * "this" side of the bridge, drop it.
         */
         * If the packet is unicast, destined for someone on
         * "this" side of the bridge, drop it.
         */
-       if ((m->m_flags & (M_BCAST|M_MCAST)) == 0) {
+       if ((m->m_flags & (M_BCAST | M_MCAST)) == 0) {
+               /* unicast */
                dst_if = bridge_rtlookup(sc, dst, vlan);
                dst_if = bridge_rtlookup(sc, dst, vlan);
-               if (src_if == dst_if)
+               if (src_if == dst_if) {
                        goto drop;
                        goto drop;
+               }
        } else {
        } else {
+               /* broadcast/multicast */
+
                /*
                 * Check if its a reserved multicast address, any address
                 * listed in 802.1D section 7.12.6 may not be forwarded by the
                /*
                 * Check if its a reserved multicast address, any address
                 * listed in 802.1D section 7.12.6 may not be forwarded by the
@@ -3593,8 +4318,9 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
                 */
                if (dst[0] == 0x01 && dst[1] == 0x80 &&
                    dst[2] == 0xc2 && dst[3] == 0x00 &&
                 */
                if (dst[0] == 0x01 && dst[1] == 0x80 &&
                    dst[2] == 0xc2 && dst[3] == 0x00 &&
-                   dst[4] == 0x00 && dst[5] <= 0x0f)
+                   dst[4] == 0x00 && dst[5] <= 0x0f) {
                        goto drop;
                        goto drop;
+               }
 
 
                /* ...forward it to all interfaces. */
 
 
                /* ...forward it to all interfaces. */
@@ -3615,60 +4341,60 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
        if (eh->ether_type == htons(ETHERTYPE_RSN_PREAUTH) ||
            dst_if != NULL || (m->m_flags & (M_BCAST | M_MCAST)) == 0) {
                m->m_pkthdr.rcvif = ifp;
        if (eh->ether_type == htons(ETHERTYPE_RSN_PREAUTH) ||
            dst_if != NULL || (m->m_flags & (M_BCAST | M_MCAST)) == 0) {
                m->m_pkthdr.rcvif = ifp;
-               if (sc->sc_bpf_input)
+               if (sc->sc_bpf_input) {
                        bridge_bpf_input(ifp, m);
                        bridge_bpf_input(ifp, m);
+               }
        }
 #endif /* NBPFILTER */
 
 #if defined(PFIL_HOOKS)
        /* run the packet filter */
        }
 #endif /* NBPFILTER */
 
 #if defined(PFIL_HOOKS)
        /* run the packet filter */
-       if (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
-           || PFIL_HOOKED(&inet6_pfil_hook)
-#endif /* INET6 */
-           ) {
+       if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
                BRIDGE_UNLOCK(sc);
                BRIDGE_UNLOCK(sc);
-               if (bridge_pfil(&m, ifp, src_if, PFIL_IN) != 0)
+               if (bridge_pfil(&m, ifp, src_if, PFIL_IN) != 0) {
                        return;
                        return;
-               if (m == NULL)
+               }
+               if (m == NULL) {
                        return;
                        return;
+               }
                BRIDGE_LOCK(sc);
        }
 #endif /* PFIL_HOOKS */
 
        if (dst_if == NULL) {
                BRIDGE_LOCK(sc);
        }
 #endif /* PFIL_HOOKS */
 
        if (dst_if == NULL) {
-               /*
-                * Clear any in-bound checksum flags for this packet.
-                */
-               mbuf_inbound_modified(m);
-
                bridge_broadcast(sc, src_if, m, 1);
                bridge_broadcast(sc, src_if, m, 1);
-
                return;
        }
 
                return;
        }
 
+       /*
+        * Unicast.
+        */
        /*
         * At this point, we're dealing with a unicast frame
         * going to a different interface.
         */
        /*
         * At this point, we're dealing with a unicast frame
         * going to a different interface.
         */
-       if ((dst_if->if_flags & IFF_RUNNING) == 0)
+       if ((dst_if->if_flags & IFF_RUNNING) == 0) {
                goto drop;
                goto drop;
+       }
 
        dbif = bridge_lookup_member_if(sc, dst_if);
 
        dbif = bridge_lookup_member_if(sc, dst_if);
-       if (dbif == NULL)
+       if (dbif == NULL) {
                /* Not a member of the bridge (anymore?) */
                goto drop;
                /* Not a member of the bridge (anymore?) */
                goto drop;
+       }
 
        /* Private segments can not talk to each other */
 
        /* Private segments can not talk to each other */
-       if (sbif->bif_flags & dbif->bif_flags & IFBIF_PRIVATE)
+       if (sbif->bif_ifflags & dbif->bif_ifflags & IFBIF_PRIVATE) {
                goto drop;
                goto drop;
+       }
 
 
-       if ((dbif->bif_flags & IFBIF_STP) &&
-           dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
+       if ((dbif->bif_ifflags & IFBIF_STP) &&
+           dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
                goto drop;
                goto drop;
+       }
 
 #if HAS_DHCPRA_MASK
 
 #if HAS_DHCPRA_MASK
-       /* APPLE MODIFICATION <rdar://6985737> */
+       /* APPLE MODIFICATION <rdar:6985737> */
        if ((dst_if->if_extflags & IFEXTF_DHCPRA_MASK) != 0) {
                m = ip_xdhcpra_output(dst_if, m);
                if (!m) {
        if ((dst_if->if_extflags & IFEXTF_DHCPRA_MASK) != 0) {
                m = ip_xdhcpra_output(dst_if, m);
                if (!m) {
@@ -3681,24 +4407,24 @@ bridge_forward(struct bridge_softc *sc, struct bridge_iflist *sbif,
        BRIDGE_UNLOCK(sc);
 
 #if defined(PFIL_HOOKS)
        BRIDGE_UNLOCK(sc);
 
 #if defined(PFIL_HOOKS)
-       if (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
-           || PFIL_HOOKED(&inet6_pfil_hook)
-#endif
-           ) {
-               if (bridge_pfil(&m, ifp, dst_if, PFIL_OUT) != 0)
+       if (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6) {
+               if (bridge_pfil(&m, ifp, dst_if, PFIL_OUT) != 0) {
                        return;
                        return;
-               if (m == NULL)
+               }
+               if (m == NULL) {
                        return;
                        return;
+               }
        }
 #endif /* PFIL_HOOKS */
 
        /*
        }
 #endif /* PFIL_HOOKS */
 
        /*
-        * Clear any in-bound checksum flags for this packet.
+        * This is an inbound packet where the checksum
+        * (if applicable) is already present/valid. Since
+        * we are just doing layer 2 forwarding (not IP
+        * forwarding), there's no need to validate the checksum.
+        * Clear the checksum offload flags and send it along.
         */
         */
-       mbuf_inbound_modified(m);
-
-       (void) bridge_enqueue(sc, dst_if, m);
+       (void) bridge_enqueue(sc, NULL, dst_if, m, kChecksumOperationClear);
        return;
 
 drop:
        return;
 
 drop:
@@ -3716,7 +4442,7 @@ ether_ntop(char *buf, size_t len, const u_char *ap)
        snprintf(buf, len, "%02x:%02x:%02x:%02x:%02x:%02x",
            ap[0], ap[1], ap[2], ap[3], ap[4], ap[5]);
 
        snprintf(buf, len, "%02x:%02x:%02x:%02x:%02x:%02x",
            ap[0], ap[1], ap[2], ap[3], ap[4], ap[5]);
 
-       return (buf);
+       return buf;
 }
 
 #endif /* BRIDGE_DEBUG */
 }
 
 #endif /* BRIDGE_DEBUG */
@@ -3728,7 +4454,7 @@ ether_ntop(char *buf, size_t len, const u_char *ap)
  *     bridging if it is not for us.
  */
 __private_extern__ errno_t
  *     bridging if it is not for us.
  */
 __private_extern__ errno_t
-bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
+bridge_input(struct ifnet *ifp, struct mbuf *m, void *frame_header)
 {
        struct bridge_softc *sc = ifp->if_bridge;
        struct bridge_iflist *bif, *bif2;
 {
        struct bridge_softc *sc = ifp->if_bridge;
        struct bridge_iflist *bif, *bif2;
@@ -3739,20 +4465,22 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
        int error;
 
 #if BRIDGE_DEBUG
        int error;
 
 #if BRIDGE_DEBUG
-       if (if_bridge_debug)
-               printf("%s: %s%d from %s%d m %p data %p\n", __func__,
-                   ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
-                   ifnet_name(ifp), ifnet_unit(ifp), m, mbuf_data(m));
+       if (if_bridge_debug & BR_DBGF_INPUT) {
+               printf("%s: %s from %s m 0x%llx data 0x%llx\n", __func__,
+                   sc->sc_ifp->if_xname, ifp->if_xname,
+                   (uint64_t)VM_KERNEL_ADDRPERM(m),
+                   (uint64_t)VM_KERNEL_ADDRPERM(mbuf_data(m)));
+       }
 #endif /* BRIDGE_DEBUG */
 
        if ((sc->sc_ifp->if_flags & IFF_RUNNING) == 0) {
 #if BRIDGE_DEBUG
 #endif /* BRIDGE_DEBUG */
 
        if ((sc->sc_ifp->if_flags & IFF_RUNNING) == 0) {
 #if BRIDGE_DEBUG
-               if (if_bridge_debug)
-                       printf("%s: %s%d not running passing along\n",
-                           __func__, ifnet_name(sc->sc_ifp),
-                           ifnet_unit(sc->sc_ifp));
+               if (if_bridge_debug & BR_DBGF_INPUT) {
+                       printf("%s: %s not running passing along\n",
+                           __func__, sc->sc_ifp->if_xname);
+               }
 #endif /* BRIDGE_DEBUG */
 #endif /* BRIDGE_DEBUG */
-               return (0);
+               return 0;
        }
 
        bifp = sc->sc_ifp;
        }
 
        bifp = sc->sc_ifp;
@@ -3770,7 +4498,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
                BRIDGE_BPF_MTAP_INPUT(sc, m);
                (void) ifnet_stat_increment_in(bifp, 1, m->m_pkthdr.len, 0);
                m_freem(m);
                BRIDGE_BPF_MTAP_INPUT(sc, m);
                (void) ifnet_stat_increment_in(bifp, 1, m->m_pkthdr.len, 0);
                m_freem(m);
-               return (EJUSTRETURN);
+               return EJUSTRETURN;
        }
 #endif /* IFF_MONITOR */
 
        }
 #endif /* IFF_MONITOR */
 
@@ -3778,37 +4506,51 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
         * Need to clear the promiscous flags otherwise it will be
         * dropped by DLIL after processing filters
         */
         * Need to clear the promiscous flags otherwise it will be
         * dropped by DLIL after processing filters
         */
-       if ((mbuf_flags(m) & MBUF_PROMISC))
+       if ((mbuf_flags(m) & MBUF_PROMISC)) {
                mbuf_setflags_mask(m, 0, MBUF_PROMISC);
                mbuf_setflags_mask(m, 0, MBUF_PROMISC);
+       }
 
        BRIDGE_LOCK(sc);
        bif = bridge_lookup_member_if(sc, ifp);
        if (bif == NULL) {
                BRIDGE_UNLOCK(sc);
 #if BRIDGE_DEBUG
 
        BRIDGE_LOCK(sc);
        bif = bridge_lookup_member_if(sc, ifp);
        if (bif == NULL) {
                BRIDGE_UNLOCK(sc);
 #if BRIDGE_DEBUG
-               if (if_bridge_debug)
-                       printf("%s: %s%d bridge_lookup_member_if failed\n",
-                           __func__, ifnet_name(sc->sc_ifp),
-                           ifnet_unit(sc->sc_ifp));
+               if (if_bridge_debug & BR_DBGF_INPUT) {
+                       printf("%s: %s bridge_lookup_member_if failed\n",
+                           __func__, sc->sc_ifp->if_xname);
+               }
 #endif /* BRIDGE_DEBUG */
 #endif /* BRIDGE_DEBUG */
-               return (0);
+               return 0;
+       }
+
+       if (bif->bif_flags & BIFF_HOST_FILTER) {
+               error = bridge_host_filter(bif, m);
+               if (error != 0) {
+                       if (if_bridge_debug & BR_DBGF_INPUT) {
+                               printf("%s: %s bridge_host_filter failed\n",
+                                   __func__, bif->bif_ifp->if_xname);
+                       }
+                       BRIDGE_UNLOCK(sc);
+                       return EJUSTRETURN;
+               }
        }
 
        eh = mtod(m, struct ether_header *);
 
        bridge_span(sc, m);
 
        }
 
        eh = mtod(m, struct ether_header *);
 
        bridge_span(sc, m);
 
-       if (m->m_flags & (M_BCAST|M_MCAST)) {
-
+       if (m->m_flags & (M_BCAST | M_MCAST)) {
 #if BRIDGE_DEBUG
 #if BRIDGE_DEBUG
-               if (if_bridge_debug)
-                       if ((m->m_flags & M_MCAST))
-                               printf("%s: mulicast: "
+               if (if_bridge_debug & BR_DBGF_MCAST) {
+                       if ((m->m_flags & M_MCAST)) {
+                               printf("%s: multicast: "
                                    "%02x:%02x:%02x:%02x:%02x:%02x\n",
                                    __func__,
                                    eh->ether_dhost[0], eh->ether_dhost[1],
                                    eh->ether_dhost[2], eh->ether_dhost[3],
                                    eh->ether_dhost[4], eh->ether_dhost[5]);
                                    "%02x:%02x:%02x:%02x:%02x:%02x\n",
                                    __func__,
                                    eh->ether_dhost[0], eh->ether_dhost[1],
                                    eh->ether_dhost[2], eh->ether_dhost[3],
                                    eh->ether_dhost[4], eh->ether_dhost[5]);
+                       }
+               }
 #endif /* BRIDGE_DEBUG */
 
                /* Tap off 802.1D packets; they do not get forwarded. */
 #endif /* BRIDGE_DEBUG */
 
                /* Tap off 802.1D packets; they do not get forwarded. */
@@ -3822,14 +4564,14 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
 #endif /* !BRIDGESTP */
                        if (m == NULL) {
                                BRIDGE_UNLOCK(sc);
 #endif /* !BRIDGESTP */
                        if (m == NULL) {
                                BRIDGE_UNLOCK(sc);
-                               return (EJUSTRETURN);
+                               return EJUSTRETURN;
                        }
                }
 
                        }
                }
 
-               if ((bif->bif_flags & IFBIF_STP) &&
+               if ((bif->bif_ifflags & IFBIF_STP) &&
                    bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
                        BRIDGE_UNLOCK(sc);
                    bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
                        BRIDGE_UNLOCK(sc);
-                       return (0);
+                       return 0;
                }
 
                /*
                }
 
                /*
@@ -3840,7 +4582,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
                mc = m_dup(m, M_DONTWAIT);
                if (mc == NULL) {
                        BRIDGE_UNLOCK(sc);
                mc = m_dup(m, M_DONTWAIT);
                if (mc == NULL) {
                        BRIDGE_UNLOCK(sc);
-                       return (0);
+                       return 0;
                }
 
                /*
                }
 
                /*
@@ -3856,8 +4598,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
                 * here from ether_input as a bridge is never a member of a
                 * bridge.
                 */
                 * here from ether_input as a bridge is never a member of a
                 * bridge.
                 */
-               KASSERT(bifp->if_bridge == NULL,
-                   ("loop created in bridge_input"));
+               VERIFY(bifp->if_bridge == NULL);
                mc2 = m_dup(m, M_DONTWAIT);
                if (mc2 != NULL) {
                        /* Keep the layer3 header aligned */
                mc2 = m_dup(m, M_DONTWAIT);
                if (mc2 != NULL) {
                        /* Keep the layer3 header aligned */
@@ -3865,105 +4606,115 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
                        mc2 = m_copyup(mc2, i, ETHER_ALIGN);
                }
                if (mc2 != NULL) {
                        mc2 = m_copyup(mc2, i, ETHER_ALIGN);
                }
                if (mc2 != NULL) {
-                       // mark packet as arriving on the bridge
+                       /* mark packet as arriving on the bridge */
                        mc2->m_pkthdr.rcvif = bifp;
                        mc2->m_pkthdr.rcvif = bifp;
-                       mc2->m_pkthdr.header = mbuf_data(mc2);
+                       mc2->m_pkthdr.pkt_hdr = mbuf_data(mc2);
 
 #if NBPFILTER > 0
 
 #if NBPFILTER > 0
-                       if (sc->sc_bpf_input)
+                       if (sc->sc_bpf_input) {
                                bridge_bpf_input(bifp, mc2);
                                bridge_bpf_input(bifp, mc2);
+                       }
 #endif /* NBPFILTER */
                        (void) mbuf_setdata(mc2,
                            (char *)mbuf_data(mc2) + ETHER_HDR_LEN,
                            mbuf_len(mc2) - ETHER_HDR_LEN);
 #endif /* NBPFILTER */
                        (void) mbuf_setdata(mc2,
                            (char *)mbuf_data(mc2) + ETHER_HDR_LEN,
                            mbuf_len(mc2) - ETHER_HDR_LEN);
-                       (void) mbuf_pkthdr_adjustlen(mc2, - ETHER_HDR_LEN);
+                       (void) mbuf_pkthdr_adjustlen(mc2, -ETHER_HDR_LEN);
 
                        (void) ifnet_stat_increment_in(bifp, 1,
                            mbuf_pkthdr_len(mc2), 0);
 
 #if BRIDGE_DEBUG
 
                        (void) ifnet_stat_increment_in(bifp, 1,
                            mbuf_pkthdr_len(mc2), 0);
 
 #if BRIDGE_DEBUG
-                       if (if_bridge_debug)
-                               printf("%s: %s%d mcast for us\n", __func__,
-                                   ifnet_name(sc->sc_ifp),
-                                   ifnet_unit(sc->sc_ifp));
+                       if (if_bridge_debug & BR_DBGF_MCAST) {
+                               printf("%s: %s mcast for us\n", __func__,
+                                   sc->sc_ifp->if_xname);
+                       }
 #endif /* BRIDGE_DEBUG */
 
                        dlil_input_packet_list(bifp, mc2);
                }
 
                /* Return the original packet for local processing. */
 #endif /* BRIDGE_DEBUG */
 
                        dlil_input_packet_list(bifp, mc2);
                }
 
                /* Return the original packet for local processing. */
-               return (0);
+               return 0;
        }
 
        }
 
-       if ((bif->bif_flags & IFBIF_STP) &&
+       if ((bif->bif_ifflags & IFBIF_STP) &&
            bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
                BRIDGE_UNLOCK(sc);
            bif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
                BRIDGE_UNLOCK(sc);
-               return (0);
+               return 0;
        }
 
 #ifdef DEV_CARP
        }
 
 #ifdef DEV_CARP
-#   define OR_CARP_CHECK_WE_ARE_DST(iface) \
-       || ((iface)->if_carp \
-           && carp_forus((iface)->if_carp, eh->ether_dhost))
-#   define OR_CARP_CHECK_WE_ARE_SRC(iface) \
-       || ((iface)->if_carp \
-           && carp_forus((iface)->if_carp, eh->ether_shost))
+#define CARP_CHECK_WE_ARE_DST(iface) \
+       ((iface)->if_carp &&\
+               carp_forus((iface)->if_carp, eh->ether_dhost))
+#define CARP_CHECK_WE_ARE_SRC(iface) \
+       ((iface)->if_carp &&\
+               carp_forus((iface)->if_carp, eh->ether_shost))
 #else
 #else
-#   define OR_CARP_CHECK_WE_ARE_DST(iface)
-#   define OR_CARP_CHECK_WE_ARE_SRC(iface)
+#define CARP_CHECK_WE_ARE_DST(iface) 0
+#define CARP_CHECK_WE_ARE_SRC(iface) 0
 #endif
 
 #ifdef INET6
 #endif
 
 #ifdef INET6
-#   define OR_PFIL_HOOKED_INET6 \
-       || PFIL_HOOKED(&inet6_pfil_hook)
+#define PFIL_HOOKED_INET6 PFIL_HOOKED(&inet6_pfil_hook)
 #else
 #else
-#   define OR_PFIL_HOOKED_INET6
+#define PFIL_HOOKED_INET6 0
 #endif
 
 #if defined(PFIL_HOOKS)
 #endif
 
 #if defined(PFIL_HOOKS)
-#define        PFIL_PHYS(sc, ifp, m) do {                                      \
-       if (pfil_local_phys &&                                          \
-       (PFIL_HOOKED(&inet_pfil_hook) OR_PFIL_HOOKED_INET6)) {          \
-               if (bridge_pfil(&m, NULL, ifp,                          \
-                   PFIL_IN) != 0 || m == NULL) {                       \
-                       BRIDGE_UNLOCK(sc);                              \
-                       return (NULL);                                  \
-               }                                                       \
-       }                                                               \
+#define PFIL_PHYS(sc, ifp, m) do {                                      \
+       if (pfil_local_phys &&                                          \
+       (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6)) {          \
+               if (bridge_pfil(&m, NULL, ifp,                          \
+                   PFIL_IN) != 0 || m == NULL) {                       \
+                       BRIDGE_UNLOCK(sc);                              \
+                       return (NULL);                                  \
+               }                                                       \
+       }                                                               \
 } while (0)
 #else /* PFIL_HOOKS */
 } while (0)
 #else /* PFIL_HOOKS */
-#define        PFIL_PHYS(sc, ifp, m)
+#define PFIL_PHYS(sc, ifp, m)
 #endif /* PFIL_HOOKS */
 
 #endif /* PFIL_HOOKS */
 
-#define        GRAB_OUR_PACKETS(iface)                                         \
-       if ((iface)->if_type == IFT_GIF)                                \
-               continue;                                               \
-       /* It is destined for us. */                                    \
-       if (memcmp(ifnet_lladdr((iface)), eh->ether_dhost,              \
-           ETHER_ADDR_LEN) == 0 OR_CARP_CHECK_WE_ARE_DST((iface))) {   \
-               if ((iface)->if_type == IFT_BRIDGE) {                   \
-                       BRIDGE_BPF_MTAP_INPUT(sc, m);                   \
-                       /* Filter on the physical interface. */         \
-                       PFIL_PHYS(sc, iface, m);                        \
-               }                                                       \
-               if (bif->bif_flags & IFBIF_LEARNING) {                  \
-                       error = bridge_rtupdate(sc, eh->ether_shost,    \
-                           vlan, bif, 0, IFBAF_DYNAMIC);               \
-                       if (error && bif->bif_addrmax) {                \
-                               BRIDGE_UNLOCK(sc);                      \
-                               return (EJUSTRETURN);                   \
-                       }                                               \
-               }                                                       \
-               m->m_pkthdr.rcvif = iface;                              \
-               BRIDGE_UNLOCK(sc);                                      \
-               return (0);                                             \
-       }                                                               \
-                                                                       \
-       /* We just received a packet that we sent out. */               \
-       if (memcmp(ifnet_lladdr((iface)), eh->ether_shost,              \
-           ETHER_ADDR_LEN) == 0 OR_CARP_CHECK_WE_ARE_SRC((iface))) {   \
-               BRIDGE_UNLOCK(sc);                                      \
-               return (EJUSTRETURN);                                   \
+#define GRAB_OUR_PACKETS(iface)                                         \
+       if ((iface)->if_type == IFT_GIF)                                \
+               continue;                                               \
+       /* It is destined for us. */                                    \
+       if (memcmp(IF_LLADDR((iface)), eh->ether_dhost,                 \
+           ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_DST((iface))) {   \
+               if ((iface)->if_type == IFT_BRIDGE) {                   \
+                       BRIDGE_BPF_MTAP_INPUT(sc, m);                   \
+       /* Filter on the physical interface. */         \
+                       PFIL_PHYS(sc, iface, m);                        \
+               } else {                                                \
+                       bpf_tap_in(iface, DLT_EN10MB, m, NULL, 0);      \
+               }                                                       \
+               if (bif->bif_ifflags & IFBIF_LEARNING) {                \
+                       error = bridge_rtupdate(sc, eh->ether_shost,    \
+                           vlan, bif, 0, IFBAF_DYNAMIC);               \
+                       if (error && bif->bif_addrmax) {                \
+                               BRIDGE_UNLOCK(sc);                      \
+                               m_freem(m);                             \
+                               return (EJUSTRETURN);                   \
+                       }                                               \
+               }                                                       \
+               BRIDGE_UNLOCK(sc);                                      \
+               mbuf_pkthdr_setrcvif(m, iface);                         \
+               mbuf_pkthdr_setheader(m, mbuf_data(m));                 \
+               mbuf_setdata(m, (char *)mbuf_data(m) + ETHER_HDR_LEN,   \
+                            mbuf_len(m) - ETHER_HDR_LEN);              \
+               mbuf_pkthdr_adjustlen(m, -ETHER_HDR_LEN);               \
+               m->m_flags |= M_PROTO1; /* set to avoid loops */        \
+               dlil_input_packet_list(iface, m);                       \
+               return (EJUSTRETURN);                                   \
+       }                                                               \
+                                                                        \
+       /* We just received a packet that we sent out. */               \
+       if (memcmp(IF_LLADDR((iface)), eh->ether_shost,                 \
+           ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_SRC((iface))) {   \
+               BRIDGE_UNLOCK(sc);                                      \
+               m_freem(m);                                             \
+               return (EJUSTRETURN);                                   \
        }
 
        /*
        }
 
        /*
@@ -3974,9 +4725,8 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
         * bridge, and return the packet back to ether_input for
         * local processing.
         */
         * bridge, and return the packet back to ether_input for
         * local processing.
         */
-       if (memcmp(eh->ether_dhost, ifnet_lladdr(bifp),
-           ETHER_ADDR_LEN) == 0 OR_CARP_CHECK_WE_ARE_DST(bifp)) {
-
+       if (memcmp(eh->ether_dhost, IF_LLADDR(bifp),
+           ETHER_ADDR_LEN) == 0 || CARP_CHECK_WE_ARE_DST(bifp)) {
                /* Mark the packet as arriving on the bridge interface */
                (void) mbuf_pkthdr_setrcvif(m, bifp);
                mbuf_pkthdr_setheader(m, frame_header);
                /* Mark the packet as arriving on the bridge interface */
                (void) mbuf_pkthdr_setrcvif(m, bifp);
                mbuf_pkthdr_setheader(m, frame_header);
@@ -3986,11 +4736,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
                 * address is valid and not multicast, record
                 * the address.
                 */
                 * address is valid and not multicast, record
                 * the address.
                 */
-               if ((bif->bif_flags & IFBIF_LEARNING) != 0 &&
-                   ETHER_IS_MULTICAST(eh->ether_shost) == 0 &&
-                   (eh->ether_shost[0] | eh->ether_shost[1] |
-                   eh->ether_shost[2] | eh->ether_shost[3] |
-                   eh->ether_shost[4] | eh->ether_shost[5]) != 0) {
+               if (bif->bif_ifflags & IFBIF_LEARNING) {
                        (void) bridge_rtupdate(sc, eh->ether_shost,
                            vlan, bif, 0, IFBAF_DYNAMIC);
                }
                        (void) bridge_rtupdate(sc, eh->ether_shost,
                            vlan, bif, 0, IFBAF_DYNAMIC);
                }
@@ -3999,21 +4745,22 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
 
                (void) mbuf_setdata(m, (char *)mbuf_data(m) + ETHER_HDR_LEN,
                    mbuf_len(m) - ETHER_HDR_LEN);
 
                (void) mbuf_setdata(m, (char *)mbuf_data(m) + ETHER_HDR_LEN,
                    mbuf_len(m) - ETHER_HDR_LEN);
-               (void) mbuf_pkthdr_adjustlen(m, - ETHER_HDR_LEN);
+               (void) mbuf_pkthdr_adjustlen(m, -ETHER_HDR_LEN);
 
                (void) ifnet_stat_increment_in(bifp, 1, mbuf_pkthdr_len(m), 0);
 
                BRIDGE_UNLOCK(sc);
 
 #if BRIDGE_DEBUG
 
                (void) ifnet_stat_increment_in(bifp, 1, mbuf_pkthdr_len(m), 0);
 
                BRIDGE_UNLOCK(sc);
 
 #if BRIDGE_DEBUG
-               if (if_bridge_debug)
-                       printf("%s: %s%d packet for bridge\n", __func__,
-                           ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp));
+               if (if_bridge_debug & BR_DBGF_INPUT) {
+                       printf("%s: %s packet for bridge\n", __func__,
+                           sc->sc_ifp->if_xname);
+               }
 #endif /* BRIDGE_DEBUG */
 
                dlil_input_packet_list(bifp, m);
 
 #endif /* BRIDGE_DEBUG */
 
                dlil_input_packet_list(bifp, m);
 
-               return (EJUSTRETURN);
+               return EJUSTRETURN;
        }
 
        /*
        }
 
        /*
@@ -4029,24 +4776,26 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
         * bridge's own MAC address, because the bridge may be
         * using the SAME MAC address as one of its interfaces
         */
         * bridge's own MAC address, because the bridge may be
         * using the SAME MAC address as one of its interfaces
         */
-       if (memcmp(eh->ether_dhost, ifnet_lladdr(ifp), ETHER_ADDR_LEN) == 0) {
+       if (memcmp(eh->ether_dhost, IF_LLADDR(ifp), ETHER_ADDR_LEN) == 0) {
 
 #ifdef VERY_VERY_VERY_DIAGNOSTIC
 
 #ifdef VERY_VERY_VERY_DIAGNOSTIC
-                       printf("%s: not forwarding packet bound for member "
-                           "interface\n", __func__);
+               printf("%s: not forwarding packet bound for member "
+                   "interface\n", __func__);
 #endif
 #endif
-                       BRIDGE_UNLOCK(sc);
-                       return (0);
+
+               BRIDGE_UNLOCK(sc);
+               return 0;
        }
 
        }
 
-       /* Now check the all bridge members. */
+       /* Now check the remaining bridge members. */
        TAILQ_FOREACH(bif2, &sc->sc_iflist, bif_next) {
        TAILQ_FOREACH(bif2, &sc->sc_iflist, bif_next) {
-               GRAB_OUR_PACKETS(bif2->bif_ifp)
+               if (bif2->bif_ifp != ifp) {
+                       GRAB_OUR_PACKETS(bif2->bif_ifp);
+               }
        }
 
        }
 
-#undef OR_CARP_CHECK_WE_ARE_DST
-#undef OR_CARP_CHECK_WE_ARE_SRC
-#undef OR_PFIL_HOOKED_INET6
+#undef CARP_CHECK_WE_ARE_DST
+#undef CARP_CHECK_WE_ARE_SRC
 #undef GRAB_OUR_PACKETS
 
        /*
 #undef GRAB_OUR_PACKETS
 
        /*
@@ -4056,7 +4805,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m, __unused void *frame_header)
         */
        bridge_forward(sc, bif, m);
 
         */
        bridge_forward(sc, bif, m);
 
-       return (EJUSTRETURN);
+       return EJUSTRETURN;
 }
 
 /*
 }
 
 /*
@@ -4077,10 +4826,25 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
 #endif
        struct bridge_iflist *dbif, *sbif;
        struct mbuf *mc;
 #endif
        struct bridge_iflist *dbif, *sbif;
        struct mbuf *mc;
+       struct mbuf *mc_in;
        struct ifnet *dst_if;
        int error = 0, used = 0;
        struct ifnet *dst_if;
        int error = 0, used = 0;
+       boolean_t is_output;
+       ChecksumOperation cksum_op;
 
 
-       sbif = bridge_lookup_member_if(sc, src_if);
+       if (src_if != NULL) {
+               is_output = FALSE;
+               cksum_op = kChecksumOperationClear;
+               sbif = bridge_lookup_member_if(sc, src_if);
+       } else {
+               /*
+                * src_if is NULL when the bridge interface calls
+                * bridge_broadcast().
+                */
+               is_output = TRUE;
+               cksum_op = kChecksumOperationFinalize;
+               sbif = NULL;
+       }
 
        BRIDGE_LOCK2REF(sc, error);
        if (error) {
 
        BRIDGE_LOCK2REF(sc, error);
        if (error) {
@@ -4090,37 +4854,46 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
 
 #ifdef PFIL_HOOKS
        /* Filter on the bridge interface before broadcasting */
 
 #ifdef PFIL_HOOKS
        /* Filter on the bridge interface before broadcasting */
-       if (runfilt && (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
-           || PFIL_HOOKED(&inet6_pfil_hook)
-#endif /* INET6 */
-           )) {
-               if (bridge_pfil(&m, sc->sc_ifp, NULL, PFIL_OUT) != 0)
+       if (runfilt && (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6)) {
+               if (bridge_pfil(&m, sc->sc_ifp, NULL, PFIL_OUT) != 0) {
                        goto out;
                        goto out;
-               if (m == NULL)
+               }
+               if (m == NULL) {
                        goto out;
                        goto out;
+               }
        }
 #endif /* PFIL_HOOKS */
 
        TAILQ_FOREACH(dbif, &sc->sc_iflist, bif_next) {
                dst_if = dbif->bif_ifp;
        }
 #endif /* PFIL_HOOKS */
 
        TAILQ_FOREACH(dbif, &sc->sc_iflist, bif_next) {
                dst_if = dbif->bif_ifp;
-               if (dst_if == src_if)
+               if (dst_if == src_if) {
+                       /* skip the interface that the packet came in on */
                        continue;
                        continue;
+               }
 
                /* Private segments can not talk to each other */
 
                /* Private segments can not talk to each other */
-               if (sbif && (sbif->bif_flags & dbif->bif_flags & IFBIF_PRIVATE))
+               if (sbif != NULL &&
+                   (sbif->bif_ifflags & dbif->bif_ifflags & IFBIF_PRIVATE)) {
+                       continue;
+               }
+
+               if ((dbif->bif_ifflags & IFBIF_STP) &&
+                   dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING) {
                        continue;
                        continue;
+               }
 
 
-               if ((dbif->bif_flags & IFBIF_STP) &&
-                   dbif->bif_stp.bp_state == BSTP_IFSTATE_DISCARDING)
+               if ((dbif->bif_ifflags & IFBIF_DISCOVER) == 0 &&
+                   (m->m_flags & (M_BCAST | M_MCAST)) == 0) {
                        continue;
                        continue;
+               }
 
 
-               if ((dbif->bif_flags & IFBIF_DISCOVER) == 0 &&
-                   (m->m_flags & (M_BCAST|M_MCAST)) == 0)
+               if ((dst_if->if_flags & IFF_RUNNING) == 0) {
                        continue;
                        continue;
+               }
 
 
-               if ((dst_if->if_flags & IFF_RUNNING) == 0)
+               if (!(dbif->bif_flags & BIFF_MEDIA_ACTIVE)) {
                        continue;
                        continue;
+               }
 
                if (TAILQ_NEXT(dbif, bif_next) == NULL) {
                        mc = m;
 
                if (TAILQ_NEXT(dbif, bif_next) == NULL) {
                        mc = m;
@@ -4134,38 +4907,73 @@ bridge_broadcast(struct bridge_softc *sc, struct ifnet *src_if,
                        }
                }
 
                        }
                }
 
+               /*
+                * If broadcast input is enabled, do so only if this
+                * is an input packet.
+                */
+               if (!is_output &&
+                   (dbif->bif_flags & BIFF_INPUT_BROADCAST) != 0) {
+                       mc_in = m_dup(mc, M_DONTWAIT);
+                       /* this could fail, but we continue anyways */
+               } else {
+                       mc_in = NULL;
+               }
+
 #ifdef PFIL_HOOKS
                /*
                 * Filter on the output interface. Pass a NULL bridge interface
                 * pointer so we do not redundantly filter on the bridge for
                 * each interface we broadcast on.
                 */
 #ifdef PFIL_HOOKS
                /*
                 * Filter on the output interface. Pass a NULL bridge interface
                 * pointer so we do not redundantly filter on the bridge for
                 * each interface we broadcast on.
                 */
-               if (runfilt && (PFIL_HOOKED(&inet_pfil_hook)
-#ifdef INET6
-                   || PFIL_HOOKED(&inet6_pfil_hook)
-#endif
-                   )) {
+               if (runfilt &&
+                   (PFIL_HOOKED(&inet_pfil_hook) || PFIL_HOOKED_INET6)) {
                        if (used == 0) {
                                /* Keep the layer3 header aligned */
                                int i = min(mc->m_pkthdr.len, max_protohdr);
                                mc = m_copyup(mc, i, ETHER_ALIGN);
                                if (mc == NULL) {
                                        (void) ifnet_stat_increment_out(
                        if (used == 0) {
                                /* Keep the layer3 header aligned */
                                int i = min(mc->m_pkthdr.len, max_protohdr);
                                mc = m_copyup(mc, i, ETHER_ALIGN);
                                if (mc == NULL) {
                                        (void) ifnet_stat_increment_out(
-                                           sc->sc_ifp, 0, 0, 1);
+                                               sc->sc_ifp, 0, 0, 1);
+                                       if (mc_in != NULL) {
+                                               m_freem(mc_in);
+                                       }
                                        continue;
                                }
                        }
                                        continue;
                                }
                        }
-                       if (bridge_pfil(&mc, NULL, dst_if, PFIL_OUT) != 0)
+                       if (bridge_pfil(&mc, NULL, dst_if, PFIL_OUT) != 0) {
+                               if (mc_in != NULL) {
+                                       m_freem(mc_in);
+                               }
                                continue;
                                continue;
-                       if (mc == NULL)
+                       }
+                       if (mc == NULL) {
+                               if (mc_in != NULL) {
+                                       m_freem(mc_in);
+                               }
                                continue;
                                continue;
+                       }
                }
 #endif /* PFIL_HOOKS */
 
                }
 #endif /* PFIL_HOOKS */
 
-               (void) bridge_enqueue(sc, dst_if, mc);
+               /* out */
+               (void) bridge_enqueue(sc, NULL, dst_if, mc, cksum_op);
+
+               /* in */
+               if (mc_in == NULL) {
+                       continue;
+               }
+               bpf_tap_in(dst_if, DLT_EN10MB, mc_in, NULL, 0);
+               mbuf_pkthdr_setrcvif(mc_in, dst_if);
+               mbuf_pkthdr_setheader(mc_in, mbuf_data(mc_in));
+               mbuf_setdata(mc_in, (char *)mbuf_data(mc_in) + ETHER_HDR_LEN,
+                   mbuf_len(mc_in) - ETHER_HDR_LEN);
+               mbuf_pkthdr_adjustlen(mc_in, -ETHER_HDR_LEN);
+               mc_in->m_flags |= M_PROTO1; /* set to avoid loops */
+               dlil_input_packet_list(dst_if, mc_in);
        }
        }
-       if (used == 0)
+       if (used == 0) {
                m_freem(m);
                m_freem(m);
+       }
 
 #ifdef PFIL_HOOKS
 out:
 
 #ifdef PFIL_HOOKS
 out:
@@ -4187,14 +4995,16 @@ bridge_span(struct bridge_softc *sc, struct mbuf *m)
        struct ifnet *dst_if;
        struct mbuf *mc;
 
        struct ifnet *dst_if;
        struct mbuf *mc;
 
-       if (TAILQ_EMPTY(&sc->sc_spanlist))
+       if (TAILQ_EMPTY(&sc->sc_spanlist)) {
                return;
                return;
+       }
 
        TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) {
                dst_if = bif->bif_ifp;
 
 
        TAILQ_FOREACH(bif, &sc->sc_spanlist, bif_next) {
                dst_if = bif->bif_ifp;
 
-               if ((dst_if->if_flags & IFF_RUNNING) == 0)
+               if ((dst_if->if_flags & IFF_RUNNING) == 0) {
                        continue;
                        continue;
+               }
 
                mc = m_copypacket(m, M_DONTWAIT);
                if (mc == NULL) {
 
                mc = m_copypacket(m, M_DONTWAIT);
                if (mc == NULL) {
@@ -4202,12 +5012,12 @@ bridge_span(struct bridge_softc *sc, struct mbuf *m)
                        continue;
                }
 
                        continue;
                }
 
-               (void) bridge_enqueue(sc, dst_if, mc);
+               (void) bridge_enqueue(sc, NULL, dst_if, mc,
+                   kChecksumOperationNone);
        }
 }
 
 
        }
 }
 
 
-
 /*
  * bridge_rtupdate:
  *
 /*
  * bridge_rtupdate:
  *
@@ -4220,18 +5030,20 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan,
        struct bridge_rtnode *brt;
        int error;
 
        struct bridge_rtnode *brt;
        int error;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        /* Check the source address is valid and not multicast. */
        if (ETHER_IS_MULTICAST(dst) ||
            (dst[0] == 0 && dst[1] == 0 && dst[2] == 0 &&
 
        /* Check the source address is valid and not multicast. */
        if (ETHER_IS_MULTICAST(dst) ||
            (dst[0] == 0 && dst[1] == 0 && dst[2] == 0 &&
-           dst[3] == 0 && dst[4] == 0 && dst[5] == 0) != 0)
-               return (EINVAL);
+           dst[3] == 0 && dst[4] == 0 && dst[5] == 0) != 0) {
+               return EINVAL;
+       }
 
 
        /* 802.1p frames map to vlan 1 */
 
 
        /* 802.1p frames map to vlan 1 */
-       if (vlan == 0)
+       if (vlan == 0) {
                vlan = 1;
                vlan = 1;
+       }
 
        /*
         * A route for this destination might already exist.  If so,
 
        /*
         * A route for this destination might already exist.  If so,
@@ -4240,12 +5052,12 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan,
        if ((brt = bridge_rtnode_lookup(sc, dst, vlan)) == NULL) {
                if (sc->sc_brtcnt >= sc->sc_brtmax) {
                        sc->sc_brtexceeded++;
        if ((brt = bridge_rtnode_lookup(sc, dst, vlan)) == NULL) {
                if (sc->sc_brtcnt >= sc->sc_brtmax) {
                        sc->sc_brtexceeded++;
-                       return (ENOSPC);
+                       return ENOSPC;
                }
                /* Check per interface address limits (if enabled) */
                if (bif->bif_addrmax && bif->bif_addrcnt >= bif->bif_addrmax) {
                        bif->bif_addrexceeded++;
                }
                /* Check per interface address limits (if enabled) */
                if (bif->bif_addrmax && bif->bif_addrcnt >= bif->bif_addrmax) {
                        bif->bif_addrexceeded++;
-                       return (ENOSPC);
+                       return ENOSPC;
                }
 
                /*
                }
 
                /*
@@ -4254,13 +5066,16 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan,
                 * address.
                 */
                brt = zalloc_noblock(bridge_rtnode_pool);
                 * address.
                 */
                brt = zalloc_noblock(bridge_rtnode_pool);
-               if (brt == NULL)
-                       return (ENOMEM);
+               if (brt == NULL) {
+                       return ENOMEM;
+               }
+               bzero(brt, sizeof(struct bridge_rtnode));
 
 
-               if (bif->bif_flags & IFBIF_STICKY)
+               if (bif->bif_ifflags & IFBIF_STICKY) {
                        brt->brt_flags = IFBAF_STICKY;
                        brt->brt_flags = IFBAF_STICKY;
-               else
+               } else {
                        brt->brt_flags = IFBAF_DYNAMIC;
                        brt->brt_flags = IFBAF_DYNAMIC;
+               }
 
                memcpy(brt->brt_addr, dst, ETHER_ADDR_LEN);
                brt->brt_vlan = vlan;
 
                memcpy(brt->brt_addr, dst, ETHER_ADDR_LEN);
                brt->brt_vlan = vlan;
@@ -4268,10 +5083,19 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan,
 
                if ((error = bridge_rtnode_insert(sc, brt)) != 0) {
                        zfree(bridge_rtnode_pool, brt);
 
                if ((error = bridge_rtnode_insert(sc, brt)) != 0) {
                        zfree(bridge_rtnode_pool, brt);
-                       return (error);
+                       return error;
                }
                brt->brt_dst = bif;
                bif->bif_addrcnt++;
                }
                brt->brt_dst = bif;
                bif->bif_addrcnt++;
+#if BRIDGE_DEBUG
+               if (if_bridge_debug & BR_DBGF_RT_TABLE) {
+                       printf("%s: added %02x:%02x:%02x:%02x:%02x:%02x "
+                           "on %s count %u hashsize %u\n", __func__,
+                           dst[0], dst[1], dst[2], dst[3], dst[4], dst[5],
+                           sc->sc_ifp->if_xname, sc->sc_brtcnt,
+                           sc->sc_rthash_size);
+               }
+#endif
        }
 
        if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC &&
        }
 
        if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC &&
@@ -4282,16 +5106,17 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, uint16_t vlan,
        }
 
        if ((flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
        }
 
        if ((flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
-               struct timespec now;
+               unsigned long now;
 
 
-               nanouptime(&now);
-               brt->brt_expire = now.tv_sec + sc->sc_brttimeout;
+               now = (unsigned long) net_uptime();
+               brt->brt_expire = now + sc->sc_brttimeout;
        }
        }
-       if (setflags)
+       if (setflags) {
                brt->brt_flags = flags;
                brt->brt_flags = flags;
+       }
 
 
 
 
-       return (0);
+       return 0;
 }
 
 /*
 }
 
 /*
@@ -4304,12 +5129,13 @@ bridge_rtlookup(struct bridge_softc *sc, const uint8_t *addr, uint16_t vlan)
 {
        struct bridge_rtnode *brt;
 
 {
        struct bridge_rtnode *brt;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
 
-       if ((brt = bridge_rtnode_lookup(sc, addr, vlan)) == NULL)
-               return (NULL);
+       if ((brt = bridge_rtnode_lookup(sc, addr, vlan)) == NULL) {
+               return NULL;
+       }
 
 
-       return (brt->brt_ifp);
+       return brt->brt_ifp;
 }
 
 /*
 }
 
 /*
@@ -4324,48 +5150,47 @@ bridge_rttrim(struct bridge_softc *sc)
 {
        struct bridge_rtnode *brt, *nbrt;
 
 {
        struct bridge_rtnode *brt, *nbrt;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        /* Make sure we actually need to do this. */
 
        /* Make sure we actually need to do this. */
-       if (sc->sc_brtcnt <= sc->sc_brtmax)
+       if (sc->sc_brtcnt <= sc->sc_brtmax) {
                return;
                return;
+       }
 
        /* Force an aging cycle; this might trim enough addresses. */
        bridge_rtage(sc);
 
        /* Force an aging cycle; this might trim enough addresses. */
        bridge_rtage(sc);
-       if (sc->sc_brtcnt <= sc->sc_brtmax)
+       if (sc->sc_brtcnt <= sc->sc_brtmax) {
                return;
                return;
+       }
 
        LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
                if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
                        bridge_rtnode_destroy(sc, brt);
 
        LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
                if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
                        bridge_rtnode_destroy(sc, brt);
-                       if (sc->sc_brtcnt <= sc->sc_brtmax)
+                       if (sc->sc_brtcnt <= sc->sc_brtmax) {
                                return;
                                return;
+                       }
                }
        }
 }
 
 /*
                }
        }
 }
 
 /*
- * bridge_timer:
+ * bridge_aging_timer:
  *
  *
- *     Aging timer for the bridge.
+ *     Aging periodic timer for the bridge routing table.
  */
 static void
  */
 static void
-bridge_timer(void *arg)
+bridge_aging_timer(struct bridge_softc *sc)
 {
 {
-       struct bridge_softc *sc = arg;
-
-       BRIDGE_LOCK(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        bridge_rtage(sc);
 
 
        bridge_rtage(sc);
 
-       BRIDGE_UNLOCK(sc);
-
-       if (sc->sc_ifp->if_flags & IFF_RUNNING) {
-               struct timespec ts;
-
-               ts.tv_sec = bridge_rtable_prune_period;
-               ts.tv_nsec = 0;
-               bsd_timeout(bridge_timer, sc, &ts);
+       if ((sc->sc_ifp->if_flags & IFF_RUNNING) &&
+           (sc->sc_flags & SCF_DETACHING) == 0) {
+               sc->sc_aging_timer.bdc_sc = sc;
+               sc->sc_aging_timer.bdc_func = bridge_aging_timer;
+               sc->sc_aging_timer.bdc_ts.tv_sec = bridge_rtable_prune_period;
+               bridge_schedule_delayed_call(&sc->sc_aging_timer);
        }
 }
 
        }
 }
 
@@ -4378,16 +5203,17 @@ static void
 bridge_rtage(struct bridge_softc *sc)
 {
        struct bridge_rtnode *brt, *nbrt;
 bridge_rtage(struct bridge_softc *sc)
 {
        struct bridge_rtnode *brt, *nbrt;
+       unsigned long now;
 
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
+
+       now = (unsigned long) net_uptime();
 
        LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
                if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
 
        LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
                if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
-                       struct timespec now;
-
-                       nanouptime(&now);
-                       if ((unsigned long)now.tv_sec >= brt->brt_expire)
+                       if (now >= brt->brt_expire) {
                                bridge_rtnode_destroy(sc, brt);
                                bridge_rtnode_destroy(sc, brt);
+                       }
                }
        }
 }
                }
        }
 }
@@ -4402,11 +5228,12 @@ bridge_rtflush(struct bridge_softc *sc, int full)
 {
        struct bridge_rtnode *brt, *nbrt;
 
 {
        struct bridge_rtnode *brt, *nbrt;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
 
        LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
-               if (full || (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)
+               if (full || (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
                        bridge_rtnode_destroy(sc, brt);
                        bridge_rtnode_destroy(sc, brt);
+               }
        }
 }
 
        }
 }
 
@@ -4421,7 +5248,7 @@ bridge_rtdaddr(struct bridge_softc *sc, const uint8_t *addr, uint16_t vlan)
        struct bridge_rtnode *brt;
        int found = 0;
 
        struct bridge_rtnode *brt;
        int found = 0;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        /*
         * If vlan is zero then we want to delete for all vlans so the lookup
 
        /*
         * If vlan is zero then we want to delete for all vlans so the lookup
@@ -4432,7 +5259,7 @@ bridge_rtdaddr(struct bridge_softc *sc, const uint8_t *addr, uint16_t vlan)
                found = 1;
        }
 
                found = 1;
        }
 
-       return (found ? 0 : ENOENT);
+       return found ? 0 : ENOENT;
 }
 
 /*
 }
 
 /*
@@ -4445,12 +5272,13 @@ bridge_rtdelete(struct bridge_softc *sc, struct ifnet *ifp, int full)
 {
        struct bridge_rtnode *brt, *nbrt;
 
 {
        struct bridge_rtnode *brt, *nbrt;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
                if (brt->brt_ifp == ifp && (full ||
 
        LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) {
                if (brt->brt_ifp == ifp && (full ||
-                   (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC))
+                   (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)) {
                        bridge_rtnode_destroy(sc, brt);
                        bridge_rtnode_destroy(sc, brt);
+               }
        }
 }
 
        }
 }
 
@@ -4462,21 +5290,147 @@ bridge_rtdelete(struct bridge_softc *sc, struct ifnet *ifp, int full)
 static int
 bridge_rtable_init(struct bridge_softc *sc)
 {
 static int
 bridge_rtable_init(struct bridge_softc *sc)
 {
-       int i;
+       u_int32_t i;
 
 
-       sc->sc_rthash = _MALLOC(sizeof (*sc->sc_rthash) * BRIDGE_RTHASH_SIZE,
-           M_DEVBUF, M_NOWAIT);
-       if (sc->sc_rthash == NULL)
-               return (ENOMEM);
+       sc->sc_rthash = _MALLOC(sizeof(*sc->sc_rthash) * BRIDGE_RTHASH_SIZE,
+           M_DEVBUF, M_WAITOK | M_ZERO);
+       if (sc->sc_rthash == NULL) {
+               printf("%s: no memory\n", __func__);
+               return ENOMEM;
+       }
+       sc->sc_rthash_size = BRIDGE_RTHASH_SIZE;
 
 
-       for (i = 0; i < BRIDGE_RTHASH_SIZE; i++)
+       for (i = 0; i < sc->sc_rthash_size; i++) {
                LIST_INIT(&sc->sc_rthash[i]);
                LIST_INIT(&sc->sc_rthash[i]);
+       }
 
 
-       sc->sc_rthash_key = random();
+       sc->sc_rthash_key = RandomULong();
 
        LIST_INIT(&sc->sc_rtlist);
 
 
        LIST_INIT(&sc->sc_rtlist);
 
-       return (0);
+       return 0;
+}
+
+/*
+ * bridge_rthash_delayed_resize:
+ *
+ *     Resize the routing table hash on a delayed thread call.
+ */
+static void
+bridge_rthash_delayed_resize(struct bridge_softc *sc)
+{
+       u_int32_t new_rthash_size;
+       struct _bridge_rtnode_list *new_rthash = NULL;
+       struct _bridge_rtnode_list *old_rthash = NULL;
+       u_int32_t i;
+       struct bridge_rtnode *brt;
+       int error = 0;
+
+       BRIDGE_LOCK_ASSERT_HELD(sc);
+
+       /*
+        * Four entries per hash bucket is our ideal load factor
+        */
+       if (sc->sc_brtcnt < sc->sc_rthash_size * 4) {
+               goto out;
+       }
+
+       /*
+        * Doubling the number of hash buckets may be too simplistic
+        * especially when facing a spike of new entries
+        */
+       new_rthash_size = sc->sc_rthash_size * 2;
+
+       sc->sc_flags |= SCF_RESIZING;
+       BRIDGE_UNLOCK(sc);
+
+       new_rthash = _MALLOC(sizeof(*sc->sc_rthash) * new_rthash_size,
+           M_DEVBUF, M_WAITOK | M_ZERO);
+
+       BRIDGE_LOCK(sc);
+       sc->sc_flags &= ~SCF_RESIZING;
+
+       if (new_rthash == NULL) {
+               error = ENOMEM;
+               goto out;
+       }
+       if ((sc->sc_flags & SCF_DETACHING)) {
+               error = ENODEV;
+               goto out;
+       }
+       /*
+        * Fail safe from here on
+        */
+       old_rthash = sc->sc_rthash;
+       sc->sc_rthash = new_rthash;
+       sc->sc_rthash_size = new_rthash_size;
+
+       /*
+        * Get a new key to force entries to be shuffled around to reduce
+        * the likelihood they will land in the same buckets
+        */
+       sc->sc_rthash_key = RandomULong();
+
+       for (i = 0; i < sc->sc_rthash_size; i++) {
+               LIST_INIT(&sc->sc_rthash[i]);
+       }
+
+       LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {
+               LIST_REMOVE(brt, brt_hash);
+               (void) bridge_rtnode_hash(sc, brt);
+       }
+out:
+       if (error == 0) {
+#if BRIDGE_DEBUG
+               if (if_bridge_debug & BR_DBGF_RT_TABLE) {
+                       printf("%s: %s new size %u\n", __func__,
+                           sc->sc_ifp->if_xname, sc->sc_rthash_size);
+               }
+#endif /* BRIDGE_DEBUG */
+               if (old_rthash) {
+                       _FREE(old_rthash, M_DEVBUF);
+               }
+       } else {
+#if BRIDGE_DEBUG
+               printf("%s: %s failed %d\n", __func__,
+                   sc->sc_ifp->if_xname, error);
+#endif /* BRIDGE_DEBUG */
+               if (new_rthash != NULL) {
+                       _FREE(new_rthash, M_DEVBUF);
+               }
+       }
+}
+
+/*
+ * Resize the number of hash buckets based on the load factor
+ * Currently only grow
+ * Failing to resize the hash table is not fatal
+ */
+static void
+bridge_rthash_resize(struct bridge_softc *sc)
+{
+       BRIDGE_LOCK_ASSERT_HELD(sc);
+
+       if ((sc->sc_flags & SCF_DETACHING) || (sc->sc_flags & SCF_RESIZING)) {
+               return;
+       }
+
+       /*
+        * Four entries per hash bucket is our ideal load factor
+        */
+       if (sc->sc_brtcnt < sc->sc_rthash_size * 4) {
+               return;
+       }
+       /*
+        * Hard limit on the size of the routing hash table
+        */
+       if (sc->sc_rthash_size >= bridge_rtable_hash_size_max) {
+               return;
+       }
+
+       sc->sc_resize_call.bdc_sc = sc;
+       sc->sc_resize_call.bdc_func = bridge_rthash_delayed_resize;
+       bridge_schedule_delayed_call(&sc->sc_resize_call);
 }
 
 /*
 }
 
 /*
@@ -4487,28 +5441,30 @@ bridge_rtable_init(struct bridge_softc *sc)
 static void
 bridge_rtable_fini(struct bridge_softc *sc)
 {
 static void
 bridge_rtable_fini(struct bridge_softc *sc)
 {
-
        KASSERT(sc->sc_brtcnt == 0,
            ("%s: %d bridge routes referenced", __func__, sc->sc_brtcnt));
        KASSERT(sc->sc_brtcnt == 0,
            ("%s: %d bridge routes referenced", __func__, sc->sc_brtcnt));
-       _FREE(sc->sc_rthash, M_DEVBUF);
+       if (sc->sc_rthash) {
+               _FREE(sc->sc_rthash, M_DEVBUF);
+               sc->sc_rthash = NULL;
+       }
 }
 
 /*
  * The following hash function is adapted from "Hash Functions" by Bob Jenkins
  * ("Algorithm Alley", Dr. Dobbs Journal, September 1997).
  */
 }
 
 /*
  * The following hash function is adapted from "Hash Functions" by Bob Jenkins
  * ("Algorithm Alley", Dr. Dobbs Journal, September 1997).
  */
-#define        mix(a, b, c)                                                    \
-do {                                                                   \
-       a -= b; a -= c; a ^= (c >> 13);                                 \
-       b -= c; b -= a; b ^= (a << 8);                                  \
-       c -= a; c -= b; c ^= (b >> 13);                                 \
-       a -= b; a -= c; a ^= (c >> 12);                                 \
-       b -= c; b -= a; b ^= (a << 16);                                 \
-       c -= a; c -= b; c ^= (b >> 5);                                  \
-       a -= b; a -= c; a ^= (c >> 3);                                  \
-       b -= c; b -= a; b ^= (a << 10);                                 \
-       c -= a; c -= b; c ^= (b >> 15);                                 \
-} while (/*CONSTCOND*/0)
+#define mix(a, b, c)                                                    \
+do {                                                                    \
+       a -= b; a -= c; a ^= (c >> 13);                                 \
+       b -= c; b -= a; b ^= (a << 8);                                  \
+       c -= a; c -= b; c ^= (b >> 13);                                 \
+       a -= b; a -= c; a ^= (c >> 12);                                 \
+       b -= c; b -= a; b ^= (a << 16);                                 \
+       c -= a; c -= b; c ^= (b >> 5);                                  \
+       a -= b; a -= c; a ^= (c >> 3);                                  \
+       b -= c; b -= a; b ^= (a << 10);                                 \
+       c -= a; c -= b; c ^= (b >> 15);                                 \
+} while ( /*CONSTCOND*/ 0)
 
 static __inline uint32_t
 bridge_rthash(struct bridge_softc *sc, const uint8_t *addr)
 
 static __inline uint32_t
 bridge_rthash(struct bridge_softc *sc, const uint8_t *addr)
@@ -4524,7 +5480,7 @@ bridge_rthash(struct bridge_softc *sc, const uint8_t *addr)
 
        mix(a, b, c);
 
 
        mix(a, b, c);
 
-       return (c & BRIDGE_RTHASH_MASK);
+       return c & BRIDGE_RTHASH_MASK(sc);
 }
 
 #undef mix
 }
 
 #undef mix
@@ -4538,7 +5494,7 @@ bridge_rtnode_addr_cmp(const uint8_t *a, const uint8_t *b)
                d = ((int)a[i]) - ((int)b[i]);
        }
 
                d = ((int)a[i]) - ((int)b[i]);
        }
 
-       return (d);
+       return d;
 }
 
 /*
 }
 
 /*
@@ -4555,34 +5511,37 @@ bridge_rtnode_lookup(struct bridge_softc *sc, const uint8_t *addr,
        uint32_t hash;
        int dir;
 
        uint32_t hash;
        int dir;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        hash = bridge_rthash(sc, addr);
        LIST_FOREACH(brt, &sc->sc_rthash[hash], brt_hash) {
                dir = bridge_rtnode_addr_cmp(addr, brt->brt_addr);
 
        hash = bridge_rthash(sc, addr);
        LIST_FOREACH(brt, &sc->sc_rthash[hash], brt_hash) {
                dir = bridge_rtnode_addr_cmp(addr, brt->brt_addr);
-               if (dir == 0 && (brt->brt_vlan == vlan || vlan == 0))
-                       return (brt);
-               if (dir > 0)
-                       return (NULL);
+               if (dir == 0 && (brt->brt_vlan == vlan || vlan == 0)) {
+                       return brt;
+               }
+               if (dir > 0) {
+                       return NULL;
+               }
        }
 
        }
 
-       return (NULL);
+       return NULL;
 }
 
 /*
 }
 
 /*
- * bridge_rtnode_insert:
+ * bridge_rtnode_hash:
  *
  *
- *     Insert the specified bridge node into the route table.  We
- *     assume the entry is not already in the table.
+ *     Insert the specified bridge node into the route hash table.
+ *     This is used when adding a new node or to rehash when resizing
+ *     the hash table
  */
 static int
  */
 static int
-bridge_rtnode_insert(struct bridge_softc *sc, struct bridge_rtnode *brt)
+bridge_rtnode_hash(struct bridge_softc *sc, struct bridge_rtnode *brt)
 {
        struct bridge_rtnode *lbrt;
        uint32_t hash;
        int dir;
 
 {
        struct bridge_rtnode *lbrt;
        uint32_t hash;
        int dir;
 
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        hash = bridge_rthash(sc, brt->brt_addr);
 
 
        hash = bridge_rthash(sc, brt->brt_addr);
 
@@ -4594,8 +5553,19 @@ bridge_rtnode_insert(struct bridge_softc *sc, struct bridge_rtnode *brt)
 
        do {
                dir = bridge_rtnode_addr_cmp(brt->brt_addr, lbrt->brt_addr);
 
        do {
                dir = bridge_rtnode_addr_cmp(brt->brt_addr, lbrt->brt_addr);
-               if (dir == 0 && brt->brt_vlan == lbrt->brt_vlan)
-                       return (EEXIST);
+               if (dir == 0 && brt->brt_vlan == lbrt->brt_vlan) {
+#if BRIDGE_DEBUG
+                       if (if_bridge_debug & BR_DBGF_RT_TABLE) {
+                               printf("%s: %s EEXIST "
+                                   "%02x:%02x:%02x:%02x:%02x:%02x\n",
+                                   __func__, sc->sc_ifp->if_xname,
+                                   brt->brt_addr[0], brt->brt_addr[1],
+                                   brt->brt_addr[2], brt->brt_addr[3],
+                                   brt->brt_addr[4], brt->brt_addr[5]);
+                       }
+#endif
+                       return EEXIST;
+               }
                if (dir > 0) {
                        LIST_INSERT_BEFORE(lbrt, brt, brt_hash);
                        goto out;
                if (dir > 0) {
                        LIST_INSERT_BEFORE(lbrt, brt, brt_hash);
                        goto out;
@@ -4607,15 +5577,41 @@ bridge_rtnode_insert(struct bridge_softc *sc, struct bridge_rtnode *brt)
                lbrt = LIST_NEXT(lbrt, brt_hash);
        } while (lbrt != NULL);
 
                lbrt = LIST_NEXT(lbrt, brt_hash);
        } while (lbrt != NULL);
 
-#ifdef DIAGNOSTIC
-       panic("bridge_rtnode_insert: impossible");
+#if BRIDGE_DEBUG
+       if (if_bridge_debug & BR_DBGF_RT_TABLE) {
+               printf("%s: %s impossible %02x:%02x:%02x:%02x:%02x:%02x\n",
+                   __func__, sc->sc_ifp->if_xname,
+                   brt->brt_addr[0], brt->brt_addr[1], brt->brt_addr[2],
+                   brt->brt_addr[3], brt->brt_addr[4], brt->brt_addr[5]);
+       }
 #endif
 
 out:
 #endif
 
 out:
+       return 0;
+}
+
+/*
+ * bridge_rtnode_insert:
+ *
+ *     Insert the specified bridge node into the route table.  We
+ *     assume the entry is not already in the table.
+ */
+static int
+bridge_rtnode_insert(struct bridge_softc *sc, struct bridge_rtnode *brt)
+{
+       int error;
+
+       error = bridge_rtnode_hash(sc, brt);
+       if (error != 0) {
+               return error;
+       }
+
        LIST_INSERT_HEAD(&sc->sc_rtlist, brt, brt_list);
        sc->sc_brtcnt++;
 
        LIST_INSERT_HEAD(&sc->sc_rtlist, brt, brt_list);
        sc->sc_brtcnt++;
 
-       return (0);
+       bridge_rthash_resize(sc);
+
+       return 0;
 }
 
 /*
 }
 
 /*
@@ -4626,7 +5622,7 @@ out:
 static void
 bridge_rtnode_destroy(struct bridge_softc *sc, struct bridge_rtnode *brt)
 {
 static void
 bridge_rtnode_destroy(struct bridge_softc *sc, struct bridge_rtnode *brt)
 {
-       BRIDGE_LOCK_ASSERT(sc);
+       BRIDGE_LOCK_ASSERT_HELD(sc);
 
        LIST_REMOVE(brt, brt_hash);
 
 
        LIST_REMOVE(brt, brt_hash);
 
@@ -4657,16 +5653,17 @@ bridge_rtable_expire(struct ifnet *ifp, int age)
        if (age == 0) {
                bridge_rtdelete(sc, ifp, IFBF_FLUSHDYN);
        } else {
        if (age == 0) {
                bridge_rtdelete(sc, ifp, IFBF_FLUSHDYN);
        } else {
-               LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {
-                       struct timespec now;
+               unsigned long now;
+
+               now = (unsigned long) net_uptime();
 
 
-                       nanouptime(&now);
+               LIST_FOREACH(brt, &sc->sc_rtlist, brt_list) {
                        /* Cap the expiry time to 'age' */
                        if (brt->brt_ifp == ifp &&
                        /* Cap the expiry time to 'age' */
                        if (brt->brt_ifp == ifp &&
-                           brt->brt_expire > (unsigned long)now.tv_sec + age &&
-                           (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)
-                               brt->brt_expire =
-                                   (unsigned long)now.tv_sec + age;
+                           brt->brt_expire > now + age &&
+                           (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) {
+                               brt->brt_expire = now + age;
+                       }
                }
        }
        BRIDGE_UNLOCK(sc);
                }
        }
        BRIDGE_UNLOCK(sc);
@@ -4690,10 +5687,11 @@ bridge_state_change(struct ifnet *ifp, int state)
                "discarding"
        };
 
                "discarding"
        };
 
-       if (log_stp)
-               log(LOG_NOTICE, "%s%d: state changed to %s on %s%d\n",
-                   ifnet_name(sc->sc_ifp), ifnet_unit(sc->sc_ifp),
-                   stpstates[state], ifnet_name(ifp), ifnet_unit(ifp));
+       if (log_stp) {
+               log(LOG_NOTICE, "%s: state changed to %s on %s\n",
+                   sc->sc_ifp->if_xname,
+                   stpstates[state], ifp->if_xname);
+       }
 }
 #endif /* BRIDGESTP */
 
 }
 #endif /* BRIDGESTP */
 
@@ -4715,22 +5713,22 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
        u_int16_t ether_type;
 
        snap = 0;
        u_int16_t ether_type;
 
        snap = 0;
-       error = -1;     /* Default error if not error == 0 */
+       error = -1;     /* Default error if not error == 0 */
 
 #if 0
        /* we may return with the IP fields swapped, ensure its not shared */
        KASSERT(M_WRITABLE(*mp), ("%s: modifying a shared mbuf", __func__));
 #endif
 
 
 #if 0
        /* we may return with the IP fields swapped, ensure its not shared */
        KASSERT(M_WRITABLE(*mp), ("%s: modifying a shared mbuf", __func__));
 #endif
 
-       if (pfil_bridge == 0 && pfil_member == 0 && pfil_ipfw == 0)
-               return (0); /* filtering is disabled */
-
+       if (pfil_bridge == 0 && pfil_member == 0 && pfil_ipfw == 0) {
+               return 0; /* filtering is disabled */
+       }
        i = min((*mp)->m_pkthdr.len, max_protohdr);
        if ((*mp)->m_len < i) {
                *mp = m_pullup(*mp, i);
                if (*mp == NULL) {
                        printf("%s: m_pullup failed\n", __func__);
        i = min((*mp)->m_pkthdr.len, max_protohdr);
        if ((*mp)->m_len < i) {
                *mp = m_pullup(*mp, i);
                if (*mp == NULL) {
                        printf("%s: m_pullup failed\n", __func__);
-                       return (-1);
+                       return -1;
                }
        }
 
                }
        }
 
@@ -4762,25 +5760,27 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
         * ARP traffic.)
         */
        switch (ether_type) {
         * ARP traffic.)
         */
        switch (ether_type) {
-               case ETHERTYPE_ARP:
-               case ETHERTYPE_REVARP:
-                       if (pfil_ipfw_arp == 0)
-                               return (0); /* Automatically pass */
-                       break;
+       case ETHERTYPE_ARP:
+       case ETHERTYPE_REVARP:
+               if (pfil_ipfw_arp == 0) {
+                       return 0;         /* Automatically pass */
+               }
+               break;
 
 
-               case ETHERTYPE_IP:
-#ifdef INET6
-               case ETHERTYPE_IPV6:
+       case ETHERTYPE_IP:
+#if INET6
+       case ETHERTYPE_IPV6:
 #endif /* INET6 */
 #endif /* INET6 */
-                       break;
-               default:
-                       /*
-                        * Check to see if the user wants to pass non-ip
-                        * packets, these will not be checked by pfil(9) and
-                        * passed unconditionally so the default is to drop.
-                        */
-                       if (pfil_onlyip)
-                               goto bad;
+               break;
+       default:
+               /*
+                * Check to see if the user wants to pass non-ip
+                * packets, these will not be checked by pfil(9) and
+                * passed unconditionally so the default is to drop.
+                */
+               if (pfil_onlyip) {
+                       goto bad;
+               }
        }
 
        /* Strip off the Ethernet header and keep a copy. */
        }
 
        /* Strip off the Ethernet header and keep a copy. */
@@ -4789,8 +5789,8 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
 
        /* Strip off snap header, if present */
        if (snap) {
 
        /* Strip off snap header, if present */
        if (snap) {
-               m_copydata(*mp, 0, sizeof (struct llc), (caddr_t)&llc1);
-               m_adj(*mp, sizeof (struct llc));
+               m_copydata(*mp, 0, sizeof(struct llc), (caddr_t)&llc1);
+               m_adj(*mp, sizeof(struct llc));
        }
 
        /*
        }
 
        /*
@@ -4798,44 +5798,46 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
         */
        if (dir == PFIL_IN) {
                switch (ether_type) {
         */
        if (dir == PFIL_IN) {
                switch (ether_type) {
-                       case ETHERTYPE_IP:
-                               error = bridge_ip_checkbasic(mp);
-                               break;
-#ifdef INET6
-                       case ETHERTYPE_IPV6:
-                               error = bridge_ip6_checkbasic(mp);
-                               break;
+               case ETHERTYPE_IP:
+                       error = bridge_ip_checkbasic(mp);
+                       break;
+#if INET6
+               case ETHERTYPE_IPV6:
+                       error = bridge_ip6_checkbasic(mp);
+                       break;
 #endif /* INET6 */
 #endif /* INET6 */
-                       default:
-                               error = 0;
+               default:
+                       error = 0;
                }
                }
-               if (error)
+               if (error) {
                        goto bad;
                        goto bad;
+               }
        }
 
        if (IPFW_LOADED && pfil_ipfw != 0 && dir == PFIL_OUT && ifp != NULL) {
                error = -1;
                args.rule = ip_dn_claim_rule(*mp);
        }
 
        if (IPFW_LOADED && pfil_ipfw != 0 && dir == PFIL_OUT && ifp != NULL) {
                error = -1;
                args.rule = ip_dn_claim_rule(*mp);
-               if (args.rule != NULL && fw_one_pass)
+               if (args.rule != NULL && fw_one_pass) {
                        goto ipfwpass; /* packet already partially processed */
                        goto ipfwpass; /* packet already partially processed */
-
+               }
                args.m = *mp;
                args.oif = ifp;
                args.next_hop = NULL;
                args.eh = &eh2;
                args.m = *mp;
                args.oif = ifp;
                args.next_hop = NULL;
                args.eh = &eh2;
-               args.inp = NULL;        /* used by ipfw uid/gid/jail rules */
+               args.inp = NULL;        /* used by ipfw uid/gid/jail rules */
                i = ip_fw_chk_ptr(&args);
                *mp = args.m;
 
                i = ip_fw_chk_ptr(&args);
                *mp = args.m;
 
-               if (*mp == NULL)
-                       return (error);
+               if (*mp == NULL) {
+                       return error;
+               }
 
                if (DUMMYNET_LOADED && (i == IP_FW_DUMMYNET)) {
 
                if (DUMMYNET_LOADED && (i == IP_FW_DUMMYNET)) {
-
                        /* put the Ethernet header back on */
                        /* put the Ethernet header back on */
-                       M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT);
-                       if (*mp == NULL)
-                               return (error);
+                       M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT, 0);
+                       if (*mp == NULL) {
+                               return error;
+                       }
                        bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN);
 
                        /*
                        bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN);
 
                        /*
@@ -4844,11 +5846,12 @@ bridge_pfil(struct mbuf **mp, struct ifnet *bifp, struct ifnet *ifp, int dir)
                         */
                        args.oif = ifp;
                        ip_dn_io_ptr(mp, DN_TO_IFB_FWD, &args, DN_CLIENT_IPFW);
                         */
                        args.oif = ifp;
                        ip_dn_io_ptr(mp, DN_TO_IFB_FWD, &args, DN_CLIENT_IPFW);
-                       return (error);
+                       return error;
                }
 
                }
 
-               if (i != IP_FW_PASS) /* drop */
+               if (i != IP_FW_PASS) /* drop */
                        goto bad;
                        goto bad;
+               }
        }
 
 ipfwpass:
        }
 
 ipfwpass:
@@ -4875,26 +5878,32 @@ ipfwpass:
                 * Keep the order:
                 *   in_if -> bridge_if -> out_if
                 */
                 * Keep the order:
                 *   in_if -> bridge_if -> out_if
                 */
-               if (pfil_bridge && dir == PFIL_OUT && bifp != NULL)
+               if (pfil_bridge && dir == PFIL_OUT && bifp != NULL) {
                        error = pfil_run_hooks(&inet_pfil_hook, mp, bifp,
                            dir, NULL);
                        error = pfil_run_hooks(&inet_pfil_hook, mp, bifp,
                            dir, NULL);
+               }
 
 
-               if (*mp == NULL || error != 0) /* filter may consume */
+               if (*mp == NULL || error != 0) /* filter may consume */
                        break;
                        break;
+               }
 
 
-               if (pfil_member && ifp != NULL)
+               if (pfil_member && ifp != NULL) {
                        error = pfil_run_hooks(&inet_pfil_hook, mp, ifp,
                            dir, NULL);
                        error = pfil_run_hooks(&inet_pfil_hook, mp, ifp,
                            dir, NULL);
+               }
 
 
-               if (*mp == NULL || error != 0) /* filter may consume */
+               if (*mp == NULL || error != 0) /* filter may consume */
                        break;
                        break;
+               }
 
 
-               if (pfil_bridge && dir == PFIL_IN && bifp != NULL)
+               if (pfil_bridge && dir == PFIL_IN && bifp != NULL) {
                        error = pfil_run_hooks(&inet_pfil_hook, mp, bifp,
                            dir, NULL);
                        error = pfil_run_hooks(&inet_pfil_hook, mp, bifp,
                            dir, NULL);
+               }
 
 
-               if (*mp == NULL || error != 0) /* filter may consume */
+               if (*mp == NULL || error != 0) /* filter may consume */
                        break;
                        break;
+               }
 
                /* check if we need to fragment the packet */
                if (pfil_member && ifp != NULL && dir == PFIL_OUT) {
 
                /* check if we need to fragment the packet */
                if (pfil_member && ifp != NULL && dir == PFIL_OUT) {
@@ -4902,50 +5911,59 @@ ipfwpass:
                        if (i > ifp->if_mtu) {
                                error = bridge_fragment(ifp, *mp, &eh2, snap,
                                    &llc1);
                        if (i > ifp->if_mtu) {
                                error = bridge_fragment(ifp, *mp, &eh2, snap,
                                    &llc1);
-                               return (error);
+                               return error;
                        }
                }
 
                /* Recalculate the ip checksum and restore byte ordering */
                ip = mtod(*mp, struct ip *);
                hlen = ip->ip_hl << 2;
                        }
                }
 
                /* Recalculate the ip checksum and restore byte ordering */
                ip = mtod(*mp, struct ip *);
                hlen = ip->ip_hl << 2;
-               if (hlen < sizeof (struct ip))
+               if (hlen < sizeof(struct ip)) {
                        goto bad;
                        goto bad;
+               }
                if (hlen > (*mp)->m_len) {
                if (hlen > (*mp)->m_len) {
-                       if ((*mp = m_pullup(*mp, hlen)) == 0)
+                       if ((*mp = m_pullup(*mp, hlen)) == 0) {
                                goto bad;
                                goto bad;
+                       }
                        ip = mtod(*mp, struct ip *);
                        ip = mtod(*mp, struct ip *);
-                       if (ip == NULL)
+                       if (ip == NULL) {
                                goto bad;
                                goto bad;
+                       }
                }
                ip->ip_len = htons(ip->ip_len);
                ip->ip_off = htons(ip->ip_off);
                ip->ip_sum = 0;
                }
                ip->ip_len = htons(ip->ip_len);
                ip->ip_off = htons(ip->ip_off);
                ip->ip_sum = 0;
-               if (hlen == sizeof (struct ip))
+               if (hlen == sizeof(struct ip)) {
                        ip->ip_sum = in_cksum_hdr(ip);
                        ip->ip_sum = in_cksum_hdr(ip);
-               else
+               } else {
                        ip->ip_sum = in_cksum(*mp, hlen);
                        ip->ip_sum = in_cksum(*mp, hlen);
+               }
 
                break;
 
                break;
-#ifdef INET6
+#if INET6
        case ETHERTYPE_IPV6:
        case ETHERTYPE_IPV6:
-               if (pfil_bridge && dir == PFIL_OUT && bifp != NULL)
+               if (pfil_bridge && dir == PFIL_OUT && bifp != NULL) {
                        error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp,
                            dir, NULL);
                        error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp,
                            dir, NULL);
+               }
 
 
-               if (*mp == NULL || error != 0) /* filter may consume */
+               if (*mp == NULL || error != 0) /* filter may consume */
                        break;
                        break;
+               }
 
 
-               if (pfil_member && ifp != NULL)
+               if (pfil_member && ifp != NULL) {
                        error = pfil_run_hooks(&inet6_pfil_hook, mp, ifp,
                            dir, NULL);
                        error = pfil_run_hooks(&inet6_pfil_hook, mp, ifp,
                            dir, NULL);
+               }
 
 
-               if (*mp == NULL || error != 0) /* filter may consume */
+               if (*mp == NULL || error != 0) /* filter may consume */
                        break;
                        break;
+               }
 
 
-               if (pfil_bridge && dir == PFIL_IN && bifp != NULL)
+               if (pfil_bridge && dir == PFIL_IN && bifp != NULL) {
                        error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp,
                            dir, NULL);
                        error = pfil_run_hooks(&inet6_pfil_hook, mp, bifp,
                            dir, NULL);
+               }
                break;
 #endif
        default:
                break;
 #endif
        default:
@@ -4953,10 +5971,12 @@ ipfwpass:
                break;
        }
 
                break;
        }
 
-       if (*mp == NULL)
-               return (error);
-       if (error != 0)
+       if (*mp == NULL) {
+               return error;
+       }
+       if (error != 0) {
                goto bad;
                goto bad;
+       }
 
        error = -1;
 
 
        error = -1;
 
@@ -4964,26 +5984,27 @@ ipfwpass:
         * Finally, put everything back the way it was and return
         */
        if (snap) {
         * Finally, put everything back the way it was and return
         */
        if (snap) {
-               M_PREPEND(*mp, sizeof (struct llc), M_DONTWAIT);
-               if (*mp == NULL)
-                       return (error);
-               bcopy(&llc1, mtod(*mp, caddr_t), sizeof (struct llc));
+               M_PREPEND(*mp, sizeof(struct llc), M_DONTWAIT, 0);
+               if (*mp == NULL) {
+                       return error;
+               }
+               bcopy(&llc1, mtod(*mp, caddr_t), sizeof(struct llc));
        }
 
        }
 
-       M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT);
-       if (*mp == NULL)
-               return (error);
+       M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT, 0);
+       if (*mp == NULL) {
+               return error;
+       }
        bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN);
 
        bcopy(&eh2, mtod(*mp, caddr_t), ETHER_HDR_LEN);
 
-       return (0);
+       return 0;
 
 bad:
        m_freem(*mp);
        *mp = NULL;
 
 bad:
        m_freem(*mp);
        *mp = NULL;
-       return (error);
+       return error;
 }
 
 }
 
-
 /*
  * Perform basic checks on header size since
  * pfil assumes ip_input has already processed
 /*
  * Perform basic checks on header size since
  * pfil assumes ip_input has already processed
@@ -5004,32 +6025,35 @@ bridge_ip_checkbasic(struct mbuf **mp)
        int len, hlen;
        u_short sum;
 
        int len, hlen;
        u_short sum;
 
-       if (*mp == NULL)
-               return (-1);
+       if (*mp == NULL) {
+               return -1;
+       }
 
        if (IP_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) {
                /* max_linkhdr is already rounded up to nearest 4-byte */
 
        if (IP_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) {
                /* max_linkhdr is already rounded up to nearest 4-byte */
-               if ((m = m_copyup(m, sizeof (struct ip),
+               if ((m = m_copyup(m, sizeof(struct ip),
                    max_linkhdr)) == NULL) {
                        /* XXXJRT new stat, please */
                        ipstat.ips_toosmall++;
                        goto bad;
                }
                    max_linkhdr)) == NULL) {
                        /* XXXJRT new stat, please */
                        ipstat.ips_toosmall++;
                        goto bad;
                }
-       } else if (__predict_false(m->m_len < sizeof (struct ip))) {
-               if ((m = m_pullup(m, sizeof (struct ip))) == NULL) {
+       } else if (__predict_false(m->m_len < sizeof(struct ip))) {
+               if ((m = m_pullup(m, sizeof(struct ip))) == NULL) {
                        ipstat.ips_toosmall++;
                        goto bad;
                }
        }
        ip = mtod(m, struct ip *);
                        ipstat.ips_toosmall++;
                        goto bad;
                }
        }
        ip = mtod(m, struct ip *);
-       if (ip == NULL) goto bad;
+       if (ip == NULL) {
+               goto bad;
+       }
 
        if (ip->ip_v != IPVERSION) {
                ipstat.ips_badvers++;
                goto bad;
        }
        hlen = ip->ip_hl << 2;
 
        if (ip->ip_v != IPVERSION) {
                ipstat.ips_badvers++;
                goto bad;
        }
        hlen = ip->ip_hl << 2;
-       if (hlen < sizeof (struct ip)) { /* minimum header length */
+       if (hlen < sizeof(struct ip)) {  /* minimum header length */
                ipstat.ips_badhlen++;
                goto bad;
        }
                ipstat.ips_badhlen++;
                goto bad;
        }
@@ -5039,13 +6063,15 @@ bridge_ip_checkbasic(struct mbuf **mp)
                        goto bad;
                }
                ip = mtod(m, struct ip *);
                        goto bad;
                }
                ip = mtod(m, struct ip *);
-               if (ip == NULL) goto bad;
+               if (ip == NULL) {
+                       goto bad;
+               }
        }
 
        if (m->m_pkthdr.csum_flags & CSUM_IP_CHECKED) {
                sum = !(m->m_pkthdr.csum_flags & CSUM_IP_VALID);
        } else {
        }
 
        if (m->m_pkthdr.csum_flags & CSUM_IP_CHECKED) {
                sum = !(m->m_pkthdr.csum_flags & CSUM_IP_VALID);
        } else {
-               if (hlen == sizeof (struct ip)) {
+               if (hlen == sizeof(struct ip)) {
                        sum = in_cksum_hdr(ip);
                } else {
                        sum = in_cksum(m, hlen);
                        sum = in_cksum_hdr(ip);
                } else {
                        sum = in_cksum(m, hlen);
@@ -5079,14 +6105,14 @@ bridge_ip_checkbasic(struct mbuf **mp)
 
        /* Checks out, proceed */
        *mp = m;
 
        /* Checks out, proceed */
        *mp = m;
-       return (0);
+       return 0;
 
 bad:
        *mp = m;
 
 bad:
        *mp = m;
-       return (-1);
+       return -1;
 }
 
 }
 
-#ifdef INET6
+#if INET6
 /*
  * Same as above, but for IPv6.
  * Cut-and-pasted from ip6_input.c.
 /*
  * Same as above, but for IPv6.
  * Cut-and-pasted from ip6_input.c.
@@ -5107,16 +6133,16 @@ bridge_ip6_checkbasic(struct mbuf **mp)
        if (IP6_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) {
                struct ifnet *inifp = m->m_pkthdr.rcvif;
                /* max_linkhdr is already rounded up to nearest 4-byte */
        if (IP6_HDR_ALIGNED_P(mtod(m, caddr_t)) == 0) {
                struct ifnet *inifp = m->m_pkthdr.rcvif;
                /* max_linkhdr is already rounded up to nearest 4-byte */
-               if ((m = m_copyup(m, sizeof (struct ip6_hdr),
+               if ((m = m_copyup(m, sizeof(struct ip6_hdr),
                    max_linkhdr)) == NULL) {
                        /* XXXJRT new stat, please */
                        ip6stat.ip6s_toosmall++;
                        in6_ifstat_inc(inifp, ifs6_in_hdrerr);
                        goto bad;
                }
                    max_linkhdr)) == NULL) {
                        /* XXXJRT new stat, please */
                        ip6stat.ip6s_toosmall++;
                        in6_ifstat_inc(inifp, ifs6_in_hdrerr);
                        goto bad;
                }
-       } else if (__predict_false(m->m_len < sizeof (struct ip6_hdr))) {
+       } else if (__predict_false(m->m_len < sizeof(struct ip6_hdr))) {
                struct ifnet *inifp = m->m_pkthdr.rcvif;
                struct ifnet *inifp = m->m_pkthdr.rcvif;
-               if ((m = m_pullup(m, sizeof (struct ip6_hdr))) == NULL) {
+               if ((m = m_pullup(m, sizeof(struct ip6_hdr))) == NULL) {
                        ip6stat.ip6s_toosmall++;
                        in6_ifstat_inc(inifp, ifs6_in_hdrerr);
                        goto bad;
                        ip6stat.ip6s_toosmall++;
                        in6_ifstat_inc(inifp, ifs6_in_hdrerr);
                        goto bad;
@@ -5133,11 +6159,11 @@ bridge_ip6_checkbasic(struct mbuf **mp)
 
        /* Checks out, proceed */
        *mp = m;
 
        /* Checks out, proceed */
        *mp = m;
-       return (0);
+       return 0;
 
 bad:
        *mp = m;
 
 bad:
        *mp = m;
-       return (-1);
+       return -1;
 }
 #endif /* INET6 */
 
 }
 #endif /* INET6 */
 
@@ -5154,29 +6180,31 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh,
        struct ip *ip;
        int error = -1;
 
        struct ip *ip;
        int error = -1;
 
-       if (m->m_len < sizeof (struct ip) &&
-           (m = m_pullup(m, sizeof (struct ip))) == NULL)
+       if (m->m_len < sizeof(struct ip) &&
+           (m = m_pullup(m, sizeof(struct ip))) == NULL) {
                goto out;
                goto out;
+       }
        ip = mtod(m, struct ip *);
 
        error = ip_fragment(ip, &m, ifp->if_mtu, ifp->if_hwassist,
            CSUM_DELAY_IP);
        ip = mtod(m, struct ip *);
 
        error = ip_fragment(ip, &m, ifp->if_mtu, ifp->if_hwassist,
            CSUM_DELAY_IP);
-       if (error)
+       if (error) {
                goto out;
                goto out;
+       }
 
        /* walk the chain and re-add the Ethernet header */
        for (m0 = m; m0; m0 = m0->m_nextpkt) {
                if (error == 0) {
                        if (snap) {
 
        /* walk the chain and re-add the Ethernet header */
        for (m0 = m; m0; m0 = m0->m_nextpkt) {
                if (error == 0) {
                        if (snap) {
-                               M_PREPEND(m0, sizeof (struct llc), M_DONTWAIT);
+                               M_PREPEND(m0, sizeof(struct llc), M_DONTWAIT, 0);
                                if (m0 == NULL) {
                                        error = ENOBUFS;
                                        continue;
                                }
                                bcopy(llc, mtod(m0, caddr_t),
                                if (m0 == NULL) {
                                        error = ENOBUFS;
                                        continue;
                                }
                                bcopy(llc, mtod(m0, caddr_t),
-                                   sizeof (struct llc));
+                                   sizeof(struct llc));
                        }
                        }
-                       M_PREPEND(m0, ETHER_HDR_LEN, M_DONTWAIT);
+                       M_PREPEND(m0, ETHER_HDR_LEN, M_DONTWAIT, 0);
                        if (m0 == NULL) {
                                error = ENOBUFS;
                                continue;
                        if (m0 == NULL) {
                                error = ENOBUFS;
                                continue;
@@ -5187,18 +6215,25 @@ bridge_fragment(struct ifnet *ifp, struct mbuf *m, struct ether_header *eh,
                }
        }
 
                }
        }
 
-       if (error == 0)
+       if (error == 0) {
                ipstat.ips_fragmented++;
                ipstat.ips_fragmented++;
+       }
 
 
-       return (error);
+       return error;
 
 out:
 
 out:
-       if (m != NULL)
+       if (m != NULL) {
                m_freem(m);
                m_freem(m);
-       return (error);
+       }
+       return error;
 }
 #endif /* PFIL_HOOKS */
 
 }
 #endif /* PFIL_HOOKS */
 
+/*
+ * bridge_set_bpf_tap:
+ *
+ *     Sets ups the BPF callbacks.
+ */
 static errno_t
 bridge_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, bpf_packet_func bpf_callback)
 {
 static errno_t
 bridge_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, bpf_packet_func bpf_callback)
 {
@@ -5206,33 +6241,37 @@ bridge_set_bpf_tap(ifnet_t ifp, bpf_tap_mode mode, bpf_packet_func bpf_callback)
 
        /* TBD locking */
        if (sc == NULL || (sc->sc_flags & SCF_DETACHING)) {
 
        /* TBD locking */
        if (sc == NULL || (sc->sc_flags & SCF_DETACHING)) {
-               return (ENODEV);
+               return ENODEV;
        }
        }
-
        switch (mode) {
        switch (mode) {
-               case BPF_TAP_DISABLE:
-                       sc->sc_bpf_input = sc->sc_bpf_output = NULL;
-                       break;
+       case BPF_TAP_DISABLE:
+               sc->sc_bpf_input = sc->sc_bpf_output = NULL;
+               break;
 
 
-               case BPF_TAP_INPUT:
-                       sc->sc_bpf_input = bpf_callback;
-                       break;
+       case BPF_TAP_INPUT:
+               sc->sc_bpf_input = bpf_callback;
+               break;
 
 
-               case BPF_TAP_OUTPUT:
-                       sc->sc_bpf_output = bpf_callback;
-                       break;
+       case BPF_TAP_OUTPUT:
+               sc->sc_bpf_output = bpf_callback;
+               break;
 
 
-               case BPF_TAP_INPUT_OUTPUT:
-                       sc->sc_bpf_input = sc->sc_bpf_output = bpf_callback;
-                       break;
+       case BPF_TAP_INPUT_OUTPUT:
+               sc->sc_bpf_input = sc->sc_bpf_output = bpf_callback;
+               break;
 
 
-               default:
-                       break;
+       default:
+               break;
        }
 
        }
 
-       return (0);
+       return 0;
 }
 
 }
 
+/*
+ * bridge_detach:
+ *
+ *     Callback when interface has been detached.
+ */
 static void
 bridge_detach(ifnet_t ifp)
 {
 static void
 bridge_detach(ifnet_t ifp)
 {
@@ -5245,17 +6284,21 @@ bridge_detach(ifnet_t ifp)
        /* Tear down the routing table. */
        bridge_rtable_fini(sc);
 
        /* Tear down the routing table. */
        bridge_rtable_fini(sc);
 
-       lck_mtx_lock(bridge_list_mtx);
+       lck_mtx_lock(&bridge_list_mtx);
        LIST_REMOVE(sc, sc_list);
        LIST_REMOVE(sc, sc_list);
-       lck_mtx_unlock(bridge_list_mtx);
+       lck_mtx_unlock(&bridge_list_mtx);
 
        ifnet_release(ifp);
 
 
        ifnet_release(ifp);
 
-       lck_mtx_free(sc->sc_mtx, bridge_lock_grp);
-
-       _FREE(sc, M_DEVBUF);
+       lck_mtx_destroy(&sc->sc_mtx, bridge_lock_grp);
+       if_clone_softc_deallocate(&bridge_cloner, sc);
 }
 
 }
 
+/*
+ * bridge_bpf_input:
+ *
+ *     Invoke the input BPF callback if enabled
+ */
 __private_extern__ errno_t
 bridge_bpf_input(ifnet_t ifp, struct mbuf *m)
 {
 __private_extern__ errno_t
 bridge_bpf_input(ifnet_t ifp, struct mbuf *m)
 {
@@ -5263,14 +6306,20 @@ bridge_bpf_input(ifnet_t ifp, struct mbuf *m)
 
        if (sc->sc_bpf_input) {
                if (mbuf_pkthdr_rcvif(m) != ifp) {
 
        if (sc->sc_bpf_input) {
                if (mbuf_pkthdr_rcvif(m) != ifp) {
-                       printf("%s: rcvif: %p != ifp %p\n", __func__,
-                           mbuf_pkthdr_rcvif(m), ifp);
+                       printf("%s: rcvif: 0x%llx != ifp 0x%llx\n", __func__,
+                           (uint64_t)VM_KERNEL_ADDRPERM(mbuf_pkthdr_rcvif(m)),
+                           (uint64_t)VM_KERNEL_ADDRPERM(ifp));
                }
                (*sc->sc_bpf_input)(ifp, m);
        }
                }
                (*sc->sc_bpf_input)(ifp, m);
        }
-       return (0);
+       return 0;
 }
 
 }
 
+/*
+ * bridge_bpf_output:
+ *
+ *     Invoke the output BPF callback if enabled
+ */
 __private_extern__ errno_t
 bridge_bpf_output(ifnet_t ifp, struct mbuf *m)
 {
 __private_extern__ errno_t
 bridge_bpf_output(ifnet_t ifp, struct mbuf *m)
 {
@@ -5279,5 +6328,319 @@ bridge_bpf_output(ifnet_t ifp, struct mbuf *m)
        if (sc->sc_bpf_output) {
                (*sc->sc_bpf_output)(ifp, m);
        }
        if (sc->sc_bpf_output) {
                (*sc->sc_bpf_output)(ifp, m);
        }
-       return (0);
+       return 0;
+}
+
+/*
+ * bridge_link_event:
+ *
+ *     Report a data link event on an interface
+ */
+static void
+bridge_link_event(struct ifnet *ifp, u_int32_t event_code)
+{
+       struct {
+               struct kern_event_msg   header;
+               u_int32_t               unit;
+               char                    if_name[IFNAMSIZ];
+       } event;
+
+#if BRIDGE_DEBUG
+       if (if_bridge_debug & BR_DBGF_LIFECYCLE) {
+               printf("%s: %s event_code %u - %s\n", __func__, ifp->if_xname,
+                   event_code, dlil_kev_dl_code_str(event_code));
+       }
+#endif /* BRIDGE_DEBUG */
+
+       bzero(&event, sizeof(event));
+       event.header.total_size         = sizeof(event);
+       event.header.vendor_code        = KEV_VENDOR_APPLE;
+       event.header.kev_class          = KEV_NETWORK_CLASS;
+       event.header.kev_subclass       = KEV_DL_SUBCLASS;
+       event.header.event_code         = event_code;
+       event.header.event_data[0]      = ifnet_family(ifp);
+       event.unit                      = (u_int32_t)ifnet_unit(ifp);
+       strlcpy(event.if_name, ifnet_name(ifp), IFNAMSIZ);
+       ifnet_event(ifp, &event.header);
+}
+
+#define BRIDGE_HF_DROP(reason, func, line) { \
+       bridge_hostfilter_stats.reason++; \
+       if (if_bridge_debug & BR_DBGF_HOSTFILTER) \
+               printf("%s.%d" #reason, func, line); \
+       error = EINVAL; \
+}
+
+/*
+ * Make sure this is a DHCP or Bootp request that match the host filter
+ */
+static int
+bridge_dhcp_filter(struct bridge_iflist *bif, struct mbuf *m, size_t offset)
+{
+       int error = EINVAL;
+       struct dhcp dhcp;
+
+       /*
+        * Note: We use the dhcp structure because bootp structure definition
+        * is larger and some vendors do not pad the request
+        */
+       error = mbuf_copydata(m, offset, sizeof(struct dhcp), &dhcp);
+       if (error != 0) {
+               BRIDGE_HF_DROP(brhf_dhcp_too_small, __func__, __LINE__);
+               goto done;
+       }
+       if (dhcp.dp_op != BOOTREQUEST) {
+               BRIDGE_HF_DROP(brhf_dhcp_bad_op, __func__, __LINE__);
+               goto done;
+       }
+       /*
+        * The hardware address must be an exact match
+        */
+       if (dhcp.dp_htype != ARPHRD_ETHER) {
+               BRIDGE_HF_DROP(brhf_dhcp_bad_htype, __func__, __LINE__);
+               goto done;
+       }
+       if (dhcp.dp_hlen != ETHER_ADDR_LEN) {
+               BRIDGE_HF_DROP(brhf_dhcp_bad_hlen, __func__, __LINE__);
+               goto done;
+       }
+       if (bcmp(dhcp.dp_chaddr, bif->bif_hf_hwsrc,
+           ETHER_ADDR_LEN) != 0) {
+               BRIDGE_HF_DROP(brhf_dhcp_bad_chaddr, __func__, __LINE__);
+               goto done;
+       }
+       /*
+        * Client address must match the host address or be not specified
+        */
+       if (dhcp.dp_ciaddr.s_addr != bif->bif_hf_ipsrc.s_addr &&
+           dhcp.dp_ciaddr.s_addr != INADDR_ANY) {
+               BRIDGE_HF_DROP(brhf_dhcp_bad_ciaddr, __func__, __LINE__);
+               goto done;
+       }
+       error = 0;
+done:
+       return error;
+}
+
+static int
+bridge_host_filter(struct bridge_iflist *bif, struct mbuf *m)
+{
+       int error = EINVAL;
+       struct ether_header *eh;
+       static struct in_addr inaddr_any = { .s_addr = INADDR_ANY };
+
+       /*
+        * Check the Ethernet header is large enough
+        */
+       if (mbuf_pkthdr_len(m) < sizeof(struct ether_header)) {
+               BRIDGE_HF_DROP(brhf_ether_too_small, __func__, __LINE__);
+               goto done;
+       }
+       if (mbuf_len(m) < sizeof(struct ether_header) &&
+           mbuf_pullup(&m, sizeof(struct ether_header)) != 0) {
+               BRIDGE_HF_DROP(brhf_ether_pullup_failed, __func__, __LINE__);
+               goto done;
+       }
+       eh = mtod(m, struct ether_header *);
+
+       /*
+        * Restrict the source hardware address
+        */
+       if ((bif->bif_flags & BIFF_HF_HWSRC) == 0 ||
+           bcmp(eh->ether_shost, bif->bif_hf_hwsrc,
+           ETHER_ADDR_LEN) != 0) {
+               BRIDGE_HF_DROP(brhf_bad_ether_srchw_addr, __func__, __LINE__);
+               goto done;
+       }
+
+       /*
+        * Restrict Ethernet protocols to ARP and IP
+        */
+       if (eh->ether_type == htons(ETHERTYPE_ARP)) {
+               struct ether_arp *ea;
+               size_t minlen = sizeof(struct ether_header) +
+                   sizeof(struct ether_arp);
+
+               /*
+                * Make the Ethernet and ARP headers contiguous
+                */
+               if (mbuf_pkthdr_len(m) < minlen) {
+                       BRIDGE_HF_DROP(brhf_arp_too_small, __func__, __LINE__);
+                       goto done;
+               }
+               if (mbuf_len(m) < minlen && mbuf_pullup(&m, minlen) != 0) {
+                       BRIDGE_HF_DROP(brhf_arp_pullup_failed,
+                           __func__, __LINE__);
+                       goto done;
+               }
+               /*
+                * Verify this is an ethernet/ip arp
+                */
+               eh = mtod(m, struct ether_header *);
+               ea = (struct ether_arp *)(eh + 1);
+               if (ea->arp_hrd != htons(ARPHRD_ETHER)) {
+                       BRIDGE_HF_DROP(brhf_arp_bad_hw_type,
+                           __func__, __LINE__);
+                       goto done;
+               }
+               if (ea->arp_pro != htons(ETHERTYPE_IP)) {
+                       BRIDGE_HF_DROP(brhf_arp_bad_pro_type,
+                           __func__, __LINE__);
+                       goto done;
+               }
+               /*
+                * Verify the address lengths are correct
+                */
+               if (ea->arp_hln != ETHER_ADDR_LEN) {
+                       BRIDGE_HF_DROP(brhf_arp_bad_hw_len, __func__, __LINE__);
+                       goto done;
+               }
+               if (ea->arp_pln != sizeof(struct in_addr)) {
+                       BRIDGE_HF_DROP(brhf_arp_bad_pro_len,
+                           __func__, __LINE__);
+                       goto done;
+               }
+
+               /*
+                * Allow only ARP request or ARP reply
+                */
+               if (ea->arp_op != htons(ARPOP_REQUEST) &&
+                   ea->arp_op != htons(ARPOP_REPLY)) {
+                       BRIDGE_HF_DROP(brhf_arp_bad_op, __func__, __LINE__);
+                       goto done;
+               }
+               /*
+                * Verify source hardware address matches
+                */
+               if (bcmp(ea->arp_sha, bif->bif_hf_hwsrc,
+                   ETHER_ADDR_LEN) != 0) {
+                       BRIDGE_HF_DROP(brhf_arp_bad_sha, __func__, __LINE__);
+                       goto done;
+               }
+               /*
+                * Verify source protocol address:
+                * May be null for an ARP probe
+                */
+               if (bcmp(ea->arp_spa, &bif->bif_hf_ipsrc.s_addr,
+                   sizeof(struct in_addr)) != 0 &&
+                   bcmp(ea->arp_spa, &inaddr_any,
+                   sizeof(struct in_addr)) != 0) {
+                       BRIDGE_HF_DROP(brhf_arp_bad_spa, __func__, __LINE__);
+                       goto done;
+               }
+               /*
+                *
+                */
+               bridge_hostfilter_stats.brhf_arp_ok += 1;
+               error = 0;
+       } else if (eh->ether_type == htons(ETHERTYPE_IP)) {
+               size_t minlen = sizeof(struct ether_header) + sizeof(struct ip);
+               struct ip iphdr;
+               size_t offset;
+
+               /*
+                * Make the Ethernet and IP headers contiguous
+                */
+               if (mbuf_pkthdr_len(m) < minlen) {
+                       BRIDGE_HF_DROP(brhf_ip_too_small, __func__, __LINE__);
+                       goto done;
+               }
+               offset = sizeof(struct ether_header);
+               error = mbuf_copydata(m, offset, sizeof(struct ip), &iphdr);
+               if (error != 0) {
+                       BRIDGE_HF_DROP(brhf_ip_too_small, __func__, __LINE__);
+                       goto done;
+               }
+               /*
+                * Verify the source IP address
+                */
+               if (iphdr.ip_p == IPPROTO_UDP) {
+                       struct udphdr udp;
+
+                       minlen += sizeof(struct udphdr);
+                       if (mbuf_pkthdr_len(m) < minlen) {
+                               BRIDGE_HF_DROP(brhf_ip_too_small,
+                                   __func__, __LINE__);
+                               goto done;
+                       }
+
+                       /*
+                        * Allow all zero addresses for DHCP requests
+                        */
+                       if (iphdr.ip_src.s_addr != bif->bif_hf_ipsrc.s_addr &&
+                           iphdr.ip_src.s_addr != INADDR_ANY) {
+                               BRIDGE_HF_DROP(brhf_ip_bad_srcaddr,
+                                   __func__, __LINE__);
+                               goto done;
+                       }
+                       offset = sizeof(struct ether_header) +
+                           (IP_VHL_HL(iphdr.ip_vhl) << 2);
+                       error = mbuf_copydata(m, offset,
+                           sizeof(struct udphdr), &udp);
+                       if (error != 0) {
+                               BRIDGE_HF_DROP(brhf_ip_too_small,
+                                   __func__, __LINE__);
+                               goto done;
+                       }
+                       /*
+                        * Either it's a Bootp/DHCP packet that we like or
+                        * it's a UDP packet from the host IP as source address
+                        */
+                       if (udp.uh_sport == htons(IPPORT_BOOTPC) &&
+                           udp.uh_dport == htons(IPPORT_BOOTPS)) {
+                               minlen += sizeof(struct dhcp);
+                               if (mbuf_pkthdr_len(m) < minlen) {
+                                       BRIDGE_HF_DROP(brhf_ip_too_small,
+                                           __func__, __LINE__);
+                                       goto done;
+                               }
+                               offset += sizeof(struct udphdr);
+                               error = bridge_dhcp_filter(bif, m, offset);
+                               if (error != 0) {
+                                       goto done;
+                               }
+                       } else if (iphdr.ip_src.s_addr == INADDR_ANY) {
+                               BRIDGE_HF_DROP(brhf_ip_bad_srcaddr,
+                                   __func__, __LINE__);
+                               goto done;
+                       }
+               } else if (iphdr.ip_src.s_addr != bif->bif_hf_ipsrc.s_addr ||
+                   bif->bif_hf_ipsrc.s_addr == INADDR_ANY) {
+                       BRIDGE_HF_DROP(brhf_ip_bad_srcaddr, __func__, __LINE__);
+                       goto done;
+               }
+               /*
+                * Allow only boring IP protocols
+                */
+               if (iphdr.ip_p != IPPROTO_TCP &&
+                   iphdr.ip_p != IPPROTO_UDP &&
+                   iphdr.ip_p != IPPROTO_ICMP &&
+                   iphdr.ip_p != IPPROTO_ESP &&
+                   iphdr.ip_p != IPPROTO_AH &&
+                   iphdr.ip_p != IPPROTO_GRE) {
+                       BRIDGE_HF_DROP(brhf_ip_bad_proto, __func__, __LINE__);
+                       goto done;
+               }
+               bridge_hostfilter_stats.brhf_ip_ok += 1;
+               error = 0;
+       } else {
+               BRIDGE_HF_DROP(brhf_bad_ether_type, __func__, __LINE__);
+               goto done;
+       }
+done:
+       if (error != 0) {
+               if (if_bridge_debug & BR_DBGF_HOSTFILTER) {
+                       if (m) {
+                               printf_mbuf_data(m, 0,
+                                   sizeof(struct ether_header) +
+                                   sizeof(struct ip));
+                       }
+                       printf("\n");
+               }
+
+               if (m != NULL) {
+                       m_freem(m);
+               }
+       }
+       return error;
 }
 }