diff options
| -rw-r--r-- | sys/netinet/ip_input.c | 4 | ||||
| -rw-r--r-- | sys/netinet/ip_output.c | 9 |
2 files changed, 0 insertions, 13 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 26cfdc807396..5d1bff38d53d 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -180,9 +180,7 @@ int fw_enable = 1 ; ip_dn_ctl_t *ip_dn_ctl_ptr; #endif -#if defined(IPFILTER_LKM) || defined(IPFILTER) int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)) = NULL; -#endif /* @@ -380,7 +378,6 @@ tooshort: #if defined(IPFIREWALL) && defined(DUMMYNET) iphack: #endif -#if defined(IPFILTER) || defined(IPFILTER_LKM) /* * Check if we want to allow this packet to be processed. * Consider it to be bad if not. @@ -392,7 +389,6 @@ iphack: return; ip = mtod(m = m1, struct ip *); } -#endif if (fw_enable && ip_fw_chk_ptr) { #ifdef IPFIREWALL_FORWARD /* diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 52350e3315b6..d9867d282ccd 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -105,12 +105,8 @@ static int ip_pcbopts __P((int, struct mbuf **, struct mbuf *)); static int ip_setmoptions __P((struct sockopt *, struct ip_moptions **)); -#if defined(IPFILTER_LKM) || defined(IPFILTER) int ip_optcopy __P((struct ip *, struct ip *)); extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)); -#else -static int ip_optcopy __P((struct ip *, struct ip *)); -#endif extern struct protosw inetsw[]; @@ -449,7 +445,6 @@ sendit: * - Wrap: fake packet's addr/port <unimpl.> * - Encapsulate: put it in another IP and send out. <unimp.> */ -#if defined(IPFILTER) || defined(IPFILTER_LKM) if (fr_checkp) { struct mbuf *m1 = m; @@ -457,7 +452,6 @@ sendit: goto done; ip = mtod(m = m1, struct ip *); } -#endif /* * Check with the firewall... @@ -958,9 +952,6 @@ ip_insertoptions(m, opt, phlen) * Copy options from ip to jp, * omitting those not copied during fragmentation. */ -#if !defined(IPFILTER) && !defined(IPFILTER_LKM) -static -#endif int ip_optcopy(ip, jp) struct ip *ip, *jp; |