diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-05-04 15:55:29 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-05-04 15:55:29 +0000 |
| commit | 587ccf793819658709d8f95ec6ada42df4ec05f7 (patch) | |
| tree | 96a976b781e33218ccad4c5249571d12a5ec5ee7 /sys | |
| parent | 2383ca5b3cf352639bc399112dbb24d5cd1a7074 (diff) | |
| download | FreeBSD-src-587ccf793819658709d8f95ec6ada42df4ec05f7.zip FreeBSD-src-587ccf793819658709d8f95ec6ada42df4ec05f7.tar.gz | |
Combine rev. 1.29 and 1.30 to something that will make sense for future
imports.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/contrib/pf/net/pf.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c index f5c2aa7..a4e8524 100644 --- a/sys/contrib/pf/net/pf.c +++ b/sys/contrib/pf/net/pf.c @@ -1800,6 +1800,8 @@ pf_send_icmp(struct mbuf *m, u_int8_t type, u_int8_t code, sa_family_t af, PF_UNLOCK(); icmp_error(m0, type, code, 0, 0); PF_LOCK(); +#else + icmp_error(m0, type, code, 0, (void *)NULL); #endif break; #endif /* INET */ @@ -5788,8 +5790,11 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp, NTOHS(ip->ip_off); PF_UNLOCK(); icmp_error(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG, 0, - ifp); + ifp->ifp_mtu); PF_LOCK(); +#else + icmp_error(m0, ICMP_UNREACH, ICMP_UNREACH_NEEDFRAG, 0, + ifp); #endif goto done; } else |
