diff options
| author | mlaier <mlaier@FreeBSD.org> | 2007-07-03 12:46:08 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2007-07-03 12:46:08 +0000 |
| commit | 83807ec50da2dec25df74073d007a33ae79d8bfd (patch) | |
| tree | d26897c8727f97369ee43f6b4684d5cfc7558dce /sys/net/if_ethersubr.c | |
| parent | edb0b6417988e1d0a2c39481b4ca6c7c2005ed9e (diff) | |
| download | FreeBSD-src-83807ec50da2dec25df74073d007a33ae79d8bfd.zip FreeBSD-src-83807ec50da2dec25df74073d007a33ae79d8bfd.tar.gz | |
Link pf 4.1 to the build:
- move ftp-proxy from libexec to usr.sbin
- add tftp-proxy
- new altq mtag link
Approved by: re (kensmith)
Diffstat (limited to 'sys/net/if_ethersubr.c')
| -rw-r--r-- | sys/net/if_ethersubr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 29014fa..7c8eb25 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -60,6 +60,7 @@ #include <net/ethernet.h> #include <net/if_bridgevar.h> #include <net/if_vlan_var.h> +#include <net/pf_mtag.h> #if defined(INET) || defined(INET6) #include <netinet/in.h> @@ -151,6 +152,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m, int error, hdrcmplt = 0; u_char esrc[ETHER_ADDR_LEN], edst[ETHER_ADDR_LEN]; struct ether_header *eh; + struct pf_mtag *t; int loop_copy = 1; int hlen; /* link layer header length */ @@ -301,7 +303,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m, * reasons and compatibility with the original behavior. */ if ((ifp->if_flags & IFF_SIMPLEX) && loop_copy && - m_tag_find(m, PACKET_TAG_PF_ROUTED, NULL) == NULL) { + ((t = pf_find_mtag(m)) == NULL || !t->routed)) { int csum_flags = 0; if (m->m_pkthdr.csum_flags & CSUM_IP) |
