Define M_ETHER_BRIDGED to M_PROTO1

diff --git a/sys/net/bridge/if_bridge.c b/sys/net/bridge/if_bridge.c
index 2a23d15..3fd1b0e 100644 (file)
--- a/sys/net/bridge/if_bridge.c
+++ b/sys/net/bridge/if_bridge.c
@@ -2181,7 +2181,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
 
        eh = mtod(m, struct ether_header *);
 
-       m->m_flags &= ~M_PROTO1; /* XXX Hack - loop prevention */
+       m->m_flags &= ~M_ETHER_BRIDGED; /* XXX Hack - loop prevention */
 
        if (memcmp(eh->ether_dhost, IF_LLADDR(bifp), ETHER_ADDR_LEN) == 0) {
                /*
@@ -2293,7 +2293,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m)
                    ETHER_ADDR_LEN) == 0) {
                        if (bif->bif_ifp != ifp) {
                                /* XXX loop prevention */
-                               m->m_flags |= M_PROTO1;
+                               m->m_flags |= M_ETHER_BRIDGED;
                                new_ifp = bif->bif_ifp;
                        }
                        if (bif->bif_flags & IFBIF_LEARNING) {

diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h
index efd8166..d7b75a0 100644 (file)
--- a/sys/net/ethernet.h
+++ b/sys/net/ethernet.h
@@ -356,6 +356,8 @@ extern const uint8_t        etherbroadcastaddr[ETHER_ADDR_LEN];
 
 #ifdef _KERNEL
 
+#define M_ETHER_BRIDGED        M_PROTO1
+
 struct ifnet;
 struct mbuf;
 struct mbuf_chain;

diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 1628c43..33628f2 100644 (file)
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1345,8 +1345,8 @@ ether_input_oncpu(struct ifnet *ifp, struct mbuf *m)
                KASSERT(bridge_input_p != NULL,
                        ("%s: if_bridge not loaded!", __func__));
 
-               if(m->m_flags & M_PROTO1) {
-                       m->m_flags &= ~M_PROTO1;
+               if(m->m_flags & M_ETHER_BRIDGED) {
+                       m->m_flags &= ~M_ETHER_BRIDGED;
                } else {
                        /* clear M_PROMISC, in case the packets comes from a vlan */
                        /* m->m_flags &= ~M_PROMISC; */