aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2021-01-27 15:25:00 +0000
committerCy Schubert <cy@FreeBSD.org>2021-02-02 01:19:15 +0000
commit7071734fae6019d1e3e44daf7deb4478582081cc (patch)
tree5ee67bc89f0e38fe6005dce39c32c693beadbee1 /sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
parent4cd1807c7d2a67b633dd0c0bfde15091543a2514 (diff)
downloadsrc-7071734fae6019d1e3e44daf7deb4478582081cc.tar.gz
src-7071734fae6019d1e3e44daf7deb4478582081cc.zip
Indentation cleanup resulting from the cleanup of #ifdefs.
The conscious decision was made not to perform any indentation or whitespace cleanup while cleaning out old redunant #ifdefs. The reason for this was to avoid confusing future readers of history and diffs with cosmetic changes, making bisection of any possible bugs introduced more difficult. This commit cleans up the whitespace detritus left behind from the previous #ifdef cleanup commits. MFC after: 1 week
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_fil_freebsd.c')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_fil_freebsd.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
index 7fc64cefb4c2..338c4e24c03a 100644
--- a/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
+++ b/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
@@ -34,9 +34,9 @@ static const char rcsid[] = "@(#)$Id$";
#include <sys/filio.h>
#include <sys/time.h>
#include <sys/systm.h>
-# include <sys/dirent.h>
+#include <sys/dirent.h>
#if defined(__FreeBSD_version)
-#include <sys/jail.h>
+# include <sys/jail.h>
#endif
#include <sys/malloc.h>
#include <sys/mbuf.h>
@@ -44,7 +44,6 @@ static const char rcsid[] = "@(#)$Id$";
#include <sys/socket.h>
#include <sys/selinfo.h>
#include <netinet/tcp_var.h>
-
#include <net/if.h>
#include <net/if_var.h>
#include <net/netisr.h>
@@ -75,19 +74,19 @@ static const char rcsid[] = "@(#)$Id$";
#include "netinet/ip_lookup.h"
#include "netinet/ip_dstlist.h"
#ifdef IPFILTER_SCAN
-#include "netinet/ip_scan.h"
+# include "netinet/ip_scan.h"
#endif
#include "netinet/ip_pool.h"
#include <sys/malloc.h>
#include <sys/kernel.h>
#ifdef CSUM_DATA_VALID
-#include <machine/in_cksum.h>
+# include <machine/in_cksum.h>
#endif
extern int ip_optcopy(struct ip *, struct ip *);
-# ifdef IPFILTER_M_IPFILTER
+#ifdef IPFILTER_M_IPFILTER
MALLOC_DEFINE(M_IPFILTER, "ipfilter", "IP Filter packet filter data structures");
-# endif
+#endif
static int ipf_send_ip(fr_info_t *, mb_t *);
@@ -98,8 +97,8 @@ VNET_DEFINE(ipf_main_softc_t, ipfmain) = {
};
#define V_ipfmain VNET(ipfmain)
-# include <sys/conf.h>
-# include <net/pfil.h>
+#include <sys/conf.h>
+#include <net/pfil.h>
VNET_DEFINE_STATIC(eventhandler_tag, ipf_arrivetag);
VNET_DEFINE_STATIC(eventhandler_tag, ipf_departtag);
@@ -278,8 +277,8 @@ ipfdetach(softc)
int
ipfioctl(dev, cmd, data, mode, p)
struct thread *p;
-# define p_cred td_ucred
-# define p_uid td_ucred->cr_ruid
+#define p_cred td_ucred
+#define p_uid td_ucred->cr_ruid
struct cdev *dev;
ioctlcmd_t cmd;
caddr_t data;