Author: rrs
Date: Wed Feb 12 13:31:36 2020
New Revision: 357818
URL: https://svnweb.freebsd.org/changeset/base/357818

Log:
  White space cleanup -- remove trailing tab's or spaces
  from any line.
  
  Sponsored by: Netflix Inc.

Modified:
  head/sys/netinet/cc/cc_cdg.c
  head/sys/netinet/cc/cc_dctcp.c
  head/sys/netinet/cc/cc_htcp.c
  head/sys/netinet/icmp6.h
  head/sys/netinet/if_ether.c
  head/sys/netinet/igmp.c
  head/sys/netinet/in.c
  head/sys/netinet/in.h
  head/sys/netinet/in_mcast.c
  head/sys/netinet/in_pcb.c
  head/sys/netinet/in_pcb.h
  head/sys/netinet/in_proto.c
  head/sys/netinet/in_rmx.c
  head/sys/netinet/ip_divert.c
  head/sys/netinet/ip_dummynet.h
  head/sys/netinet/ip_fastfwd.c
  head/sys/netinet/ip_fw.h
  head/sys/netinet/ip_icmp.c
  head/sys/netinet/ip_id.c
  head/sys/netinet/ip_input.c
  head/sys/netinet/ip_mroute.c
  head/sys/netinet/ip_options.c
  head/sys/netinet/ip_reass.c
  head/sys/netinet/raw_ip.c
  head/sys/netinet/siftr.c
  head/sys/netinet/tcp.h
  head/sys/netinet/tcp_fastopen.c
  head/sys/netinet/tcp_fsm.h
  head/sys/netinet/tcp_input.c
  head/sys/netinet/tcp_log_buf.c
  head/sys/netinet/tcp_log_buf.h
  head/sys/netinet/tcp_lro.c
  head/sys/netinet/tcp_lro.h
  head/sys/netinet/tcp_output.c
  head/sys/netinet/tcp_ratelimit.c
  head/sys/netinet/tcp_ratelimit.h
  head/sys/netinet/tcp_reass.c
  head/sys/netinet/tcp_sack.c
  head/sys/netinet/tcp_subr.c
  head/sys/netinet/tcp_syncache.c
  head/sys/netinet/tcp_timer.c
  head/sys/netinet/tcp_timer.h
  head/sys/netinet/tcp_usrreq.c
  head/sys/netinet/tcp_var.h
  head/sys/netinet/udp.h
  head/sys/netinet/udp_usrreq.c
  head/sys/netinet/udp_var.h
  head/sys/netinet/udplite.h

Modified: head/sys/netinet/cc/cc_cdg.c
==============================================================================
--- head/sys/netinet/cc/cc_cdg.c        Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/cc/cc_cdg.c        Wed Feb 12 13:31:36 2020        
(r357818)
@@ -607,7 +607,7 @@ cdg_ack_received(struct cc_var *ccv, uint16_t ack_type
                                congestion = prob_backoff(qdiff_max);
                        else if (cdg_data->max_qtrend > 0)
                                congestion = prob_backoff(cdg_data->max_qtrend);
-                       
+
                        /* Update estimate of queue state. */
                        if (cdg_data->min_qtrend > 0 &&
                            cdg_data->max_qtrend <= 0) {

Modified: head/sys/netinet/cc/cc_dctcp.c
==============================================================================
--- head/sys/netinet/cc/cc_dctcp.c      Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/cc/cc_dctcp.c      Wed Feb 12 13:31:36 2020        
(r357818)
@@ -274,9 +274,9 @@ dctcp_cong_signal(struct cc_var *ccv, uint32_t type)
                                        dctcp_data->bytes_total = 0;
                                        dctcp_data->save_sndnxt = CCV(ccv, 
snd_nxt);
                                } else
-                                       CCV(ccv, snd_ssthresh) = 
+                                       CCV(ccv, snd_ssthresh) =
                                            max((cwin - (((uint64_t)cwin *
-                                           dctcp_data->alpha) >> 
(DCTCP_SHIFT+1))), 
+                                           dctcp_data->alpha) >> 
(DCTCP_SHIFT+1))),
                                            2 * mss);
                                CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh);
                                ENTER_CONGRECOVERY(CCV(ccv, t_flags));

Modified: head/sys/netinet/cc/cc_htcp.c
==============================================================================
--- head/sys/netinet/cc/cc_htcp.c       Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/cc/cc_htcp.c       Wed Feb 12 13:31:36 2020        
(r357818)
@@ -364,7 +364,7 @@ htcp_post_recovery(struct cc_var *ccv)
                        pipe = tcp_compute_pipe(ccv->ccvc.tcp);
                else
                        pipe = CCV(ccv, snd_max) - ccv->curack;
-               
+
                if (pipe < CCV(ccv, snd_ssthresh))
                        /*
                         * Ensure that cwnd down not collape to 1 MSS under

Modified: head/sys/netinet/icmp6.h
==============================================================================
--- head/sys/netinet/icmp6.h    Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/icmp6.h    Wed Feb 12 13:31:36 2020        (r357818)
@@ -344,7 +344,7 @@ struct nd_opt_mtu {         /* MTU option */
 #define        ND_OPT_NONCE_LEN        ((1 * 8) - 2)
 #if ((ND_OPT_NONCE_LEN + 2) % 8) != 0
 #error "(ND_OPT_NONCE_LEN + 2) must be a multiple of 8."
-#endif 
+#endif
 struct nd_opt_nonce {          /* nonce option */
        u_int8_t        nd_opt_nonce_type;
        u_int8_t        nd_opt_nonce_len;
@@ -607,7 +607,7 @@ struct icmp6stat {
         * for netinet6 code, it is already available in icp6s_outhist[].
         */
        uint64_t icp6s_reflect;
-       uint64_t icp6s_inhist[256];     
+       uint64_t icp6s_inhist[256];
        uint64_t icp6s_nd_toomanyopt;   /* too many ND options */
        struct icmp6errstat icp6s_outerrhist;
 #define icp6s_odst_unreach_noroute \

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/if_ether.c Wed Feb 12 13:31:36 2020        (r357818)
@@ -211,7 +211,7 @@ arptimer(void *arg)
        LLE_WLOCK(lle);
        if (callout_pending(&lle->lle_timer)) {
                /*
-                * Here we are a bit odd here in the treatment of 
+                * Here we are a bit odd here in the treatment of
                 * active/pending. If the pending bit is set, it got
                 * rescheduled before I ran. The active
                 * bit we ignore, since if it was stopped
@@ -709,7 +709,7 @@ arpintr(struct mbuf *m)
                layer = "ethernet";
                break;
        case ARPHRD_INFINIBAND:
-               hlen = 20;      /* RFC 4391, INFINIBAND_ALEN */ 
+               hlen = 20;      /* RFC 4391, INFINIBAND_ALEN */
                layer = "infiniband";
                break;
        case ARPHRD_IEEE1394:

Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c     Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/igmp.c     Wed Feb 12 13:31:36 2020        (r357818)
@@ -877,7 +877,7 @@ out_locked:
  * We may be updating the group for the first time since we switched
  * to IGMPv3. If we are, then we must clear any recorded source lists,
  * and transition to REPORTING state; the group timer is overloaded
- * for group and group-source query responses. 
+ * for group and group-source query responses.
  *
  * Unlike IGMPv3, the delay per group should be jittered
  * to avoid bursts of IGMPv2 reports.
@@ -2324,7 +2324,7 @@ igmp_initial_join(struct in_multi *inm, struct igmp_if
        struct ifnet            *ifp;
        struct mbufq            *mq;
        int                      error, retval, syncstates;
- 
+
        CTR4(KTR_IGMPV3, "%s: initial join 0x%08x on ifp %p(%s)", __func__,
            ntohl(inm->inm_addr.s_addr), inm->inm_ifp, inm->inm_ifp->if_xname);
 

Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c       Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/in.c       Wed Feb 12 13:31:36 2020        (r357818)
@@ -820,11 +820,11 @@ in_scrubprefix(struct in_ifaddr *target, u_int flags)
 
        if ((target->ia_flags & IFA_ROUTE) == 0) {
                int fibnum;
-               
+
                fibnum = V_rt_add_addr_allfibs ? RT_ALL_FIBS :
                        target->ia_ifp->if_fib;
                rt_addrmsg(RTM_DELETE, &target->ia_ifa, fibnum);
-       
+
                /*
                 * Removing address from !IFF_UP interface or
                 * prefix which exists on other interface (along with route).

Modified: head/sys/netinet/in.h
==============================================================================
--- head/sys/netinet/in.h       Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/in.h       Wed Feb 12 13:31:36 2020        (r357818)
@@ -323,8 +323,8 @@ __END_DECLS
  * Default local port range, used by IP_PORTRANGE_DEFAULT
  */
 #define IPPORT_EPHEMERALFIRST  10000
-#define IPPORT_EPHEMERALLAST   65535 
- 
+#define IPPORT_EPHEMERALLAST   65535
+
 /*
  * Dynamic port range, used by IP_PORTRANGE_HIGH.
  */
@@ -381,7 +381,7 @@ __END_DECLS
                         (((in_addr_t)(i) & 0xffff0000) == 0xc0a80000))
 
 #define        IN_LOCAL_GROUP(i)       (((in_addr_t)(i) & 0xffffff00) == 
0xe0000000)
- 
+
 #define        IN_ANY_LOCAL(i)         (IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i))
 
 #define        INADDR_LOOPBACK         ((in_addr_t)0x7f000001)

Modified: head/sys/netinet/in_mcast.c
==============================================================================
--- head/sys/netinet/in_mcast.c Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/in_mcast.c Wed Feb 12 13:31:36 2020        (r357818)
@@ -526,7 +526,7 @@ in_getmulti(struct ifnet *ifp, const struct in_addr *g
        IN_MULTI_LIST_UNLOCK();
        if (inm != NULL)
                return (0);
-       
+
        memset(&gsin, 0, sizeof(gsin));
        gsin.sin_family = AF_INET;
        gsin.sin_len = sizeof(struct sockaddr_in);
@@ -2207,7 +2207,7 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt
                        goto out_inp_unlocked;
                }
                if (error) {
-                        CTR1(KTR_IGMPV3, "%s: in_joingroup_locked failed", 
+                        CTR1(KTR_IGMPV3, "%s: in_joingroup_locked failed",
                             __func__);
                        goto out_inp_locked;
                }
@@ -2627,7 +2627,7 @@ inp_set_source_filters(struct inpcb *inp, struct socko
                int                      i;
 
                INP_WUNLOCK(inp);
- 
+
                CTR2(KTR_IGMPV3, "%s: loading %lu source list entries",
                    __func__, (unsigned long)msfr.msfr_nsrcs);
                kss = malloc(sizeof(struct sockaddr_storage) * msfr.msfr_nsrcs,

Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c   Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/in_pcb.c   Wed Feb 12 13:31:36 2020        (r357818)
@@ -1059,7 +1059,7 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, 
        /*
         * If we found a route, use the address corresponding to
         * the outgoing interface.
-        * 
+        *
         * Otherwise assume faddr is reachable on a directly connected
         * network and try to find a corresponding interface to take
         * the source address from.
@@ -1454,13 +1454,13 @@ in_pcbrele_rlocked(struct inpcb *inp)
                }
                return (0);
        }
-       
+
        KASSERT(inp->inp_socket == NULL, ("%s: inp_socket != NULL", __func__));
 #ifdef TCPHPTS
        if (inp->inp_in_hpts || inp->inp_in_input) {
                struct tcp_hpts_entry *hpts;
                /*
-                * We should not be on the hpts at 
+                * We should not be on the hpts at
                 * this point in any form. we must
                 * get the lock to be sure.
                 */
@@ -1470,7 +1470,7 @@ in_pcbrele_rlocked(struct inpcb *inp)
                              hpts, inp);
                mtx_unlock(&hpts->p_mtx);
                hpts = tcp_input_lock(inp);
-               if (inp->inp_in_input) 
+               if (inp->inp_in_input)
                        panic("Hpts:%p inp:%p at free still on input hpts",
                              hpts, inp);
                mtx_unlock(&hpts->p_mtx);
@@ -1508,7 +1508,7 @@ in_pcbrele_wlocked(struct inpcb *inp)
        if (inp->inp_in_hpts || inp->inp_in_input) {
                struct tcp_hpts_entry *hpts;
                /*
-                * We should not be on the hpts at 
+                * We should not be on the hpts at
                 * this point in any form. we must
                 * get the lock to be sure.
                 */
@@ -1518,7 +1518,7 @@ in_pcbrele_wlocked(struct inpcb *inp)
                              hpts, inp);
                mtx_unlock(&hpts->p_mtx);
                hpts = tcp_input_lock(inp);
-               if (inp->inp_in_input) 
+               if (inp->inp_in_input)
                        panic("Hpts:%p inp:%p at free still on input hpts",
                              hpts, inp);
                mtx_unlock(&hpts->p_mtx);
@@ -1612,7 +1612,7 @@ in_pcbfree_deferred(epoch_context_t ctx)
 #endif
 #ifdef INET
        inp_freemoptions(imo);
-#endif 
+#endif
        CURVNET_RESTORE();
 }
 
@@ -2731,7 +2731,7 @@ ip_fini(void *xtp)
        callout_stop(&ipport_tick_callout);
 }
 
-/* 
+/*
  * The ipport_callout should start running at about the time we attach the
  * inet or inet6 domains.
  */
@@ -2745,7 +2745,7 @@ ipport_tick_init(const void *unused __unused)
        EVENTHANDLER_REGISTER(shutdown_pre_sync, ip_fini, NULL,
                SHUTDOWN_PRI_DEFAULT);
 }
-SYSINIT(ipport_tick_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, 
+SYSINIT(ipport_tick_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE,
     ipport_tick_init, NULL);
 
 void

Modified: head/sys/netinet/in_pcb.h
==============================================================================
--- head/sys/netinet/in_pcb.h   Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/in_pcb.h   Wed Feb 12 13:31:36 2020        (r357818)
@@ -163,22 +163,22 @@ struct in_conninfo {
  * (h) - Protected by the pcbhash lock for the inpcb
  * (s) - Protected by another subsystem's locks
  * (x) - Undefined locking
- * 
+ *
  * Notes on the tcp_hpts:
- * 
+ *
  * First Hpts lock order is
  * 1) INP_WLOCK()
- * 2) HPTS_LOCK() i.e. hpts->pmtx 
+ * 2) HPTS_LOCK() i.e. hpts->pmtx
  *
- * To insert a TCB on the hpts you *must* be holding the INP_WLOCK(). 
- * You may check the inp->inp_in_hpts flag without the hpts lock. 
- * The hpts is the only one that will clear this flag holding 
+ * To insert a TCB on the hpts you *must* be holding the INP_WLOCK().
+ * You may check the inp->inp_in_hpts flag without the hpts lock.
+ * The hpts is the only one that will clear this flag holding
  * only the hpts lock. This means that in your tcp_output()
- * routine when you test for the inp_in_hpts flag to be 1 
- * it may be transitioning to 0 (by the hpts). 
- * That's ok since that will just mean an extra call to tcp_output 
+ * routine when you test for the inp_in_hpts flag to be 1
+ * it may be transitioning to 0 (by the hpts).
+ * That's ok since that will just mean an extra call to tcp_output
  * that most likely will find the call you executed
- * (when the mis-match occured) will have put the TCB back 
+ * (when the mis-match occured) will have put the TCB back
  * on the hpts and it will return. If your
  * call did not add the inp back to the hpts then you will either
  * over-send or the cwnd will block you from sending more.
@@ -189,7 +189,7 @@ struct in_conninfo {
  * the INP_WLOCK() or from destroying your TCB where again
  * you should already have the INP_WLOCK().
  *
- * The inp_hpts_cpu, inp_hpts_cpu_set, inp_input_cpu and 
+ * The inp_hpts_cpu, inp_hpts_cpu_set, inp_input_cpu and
  * inp_input_cpu_set fields are controlled completely by
  * the hpts. Do not ever set these. The inp_hpts_cpu_set
  * and inp_input_cpu_set fields indicate if the hpts has
@@ -243,14 +243,14 @@ struct inpcb {
                                         * fits in the pacing window (i&b). */
        /*
         * Note the next fields are protected by a
-        * different lock (hpts-lock). This means that 
+        * different lock (hpts-lock). This means that
         * they must correspond in size to the smallest
         * protectable bit field (uint8_t on x86, and
         * other platfomrs potentially uint32_t?). Also
         * since CPU switches can occur at different times the two
         * fields can *not* be collapsed into a signal bit field.
         */
-#if defined(__amd64__) || defined(__i386__)    
+#if defined(__amd64__) || defined(__i386__)
        volatile uint8_t inp_in_hpts; /* on output hpts (lock b) */
        volatile uint8_t inp_in_input; /* on input hpts (lock b) */
 #else

Modified: head/sys/netinet/in_proto.c
==============================================================================
--- head/sys/netinet/in_proto.c Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/in_proto.c Wed Feb 12 13:31:36 2020        (r357818)
@@ -146,7 +146,7 @@ struct protosw inetsw[] = {
        .pr_usrreqs =           &tcp_usrreqs
 },
 #ifdef SCTP
-{ 
+{
        .pr_type =              SOCK_SEQPACKET,
        .pr_domain =            &inetdomain,
        .pr_protocol =          IPPROTO_SCTP,
@@ -158,7 +158,7 @@ struct protosw inetsw[] = {
        .pr_drain =             sctp_drain,
        .pr_usrreqs =           &sctp_usrreqs
 },
-{ 
+{
        .pr_type =              SOCK_STREAM,
        .pr_domain =            &inetdomain,
        .pr_protocol =          IPPROTO_SCTP,

Modified: head/sys/netinet/in_rmx.c
==============================================================================
--- head/sys/netinet/in_rmx.c   Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/in_rmx.c   Wed Feb 12 13:31:36 2020        (r357818)
@@ -187,7 +187,7 @@ in_ifadown(struct ifaddr *ifa, int delete)
 }
 
 /*
- * inet versions of rt functions. These have fib extensions and 
+ * inet versions of rt functions. These have fib extensions and
  * for now will just reference the _fib variants.
  * eventually this order will be reversed,
  */

Modified: head/sys/netinet/ip_divert.c
==============================================================================
--- head/sys/netinet/ip_divert.c        Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/ip_divert.c        Wed Feb 12 13:31:36 2020        
(r357818)
@@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/netisr.h> 
+#include <net/netisr.h>
 
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
@@ -252,10 +252,10 @@ divert_packet(struct mbuf *m, bool incoming)
         */
        if (m->m_pkthdr.rcvif) {
                /*
-                * Hide the actual interface name in there in the 
+                * Hide the actual interface name in there in the
                 * sin_zero array. XXX This needs to be moved to a
                 * different sockaddr type for divert, e.g.
-                * sockaddr_div with multiple fields like 
+                * sockaddr_div with multiple fields like
                 * sockaddr_dl. Presently we have only 7 bytes
                 * but that will do for now as most interfaces
                 * are 4 or less + 2 or less bytes for unit.
@@ -268,7 +268,7 @@ divert_packet(struct mbuf *m, bool incoming)
                 * and re-uses the sockaddr_in as suggested in the man pages,
                 * this iface name will come along for the ride.
                 * (see div_output for the other half of this.)
-                */ 
+                */
                strlcpy(divsrc.sin_zero, m->m_pkthdr.rcvif->if_xname,
                    sizeof(divsrc.sin_zero));
        }

Modified: head/sys/netinet/ip_dummynet.h
==============================================================================
--- head/sys/netinet/ip_dummynet.h      Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/ip_dummynet.h      Wed Feb 12 13:31:36 2020        
(r357818)
@@ -277,7 +277,7 @@ the objects used by dummynet:
    to delay and bandwidth;
  + dn_profile describes a delay profile;
  + dn_flow describes the flow status (flow id, statistics)
-   
+
  + dn_sch describes a scheduler
  + dn_fs describes a flowset (msk, weight, queue parameters)
 

Modified: head/sys/netinet/ip_fastfwd.c
==============================================================================
--- head/sys/netinet/ip_fastfwd.c       Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/ip_fastfwd.c       Wed Feb 12 13:31:36 2020        
(r357818)
@@ -57,7 +57,7 @@
  *
  * We try to do the least expensive (in CPU ops) checks and operations
  * first to catch junk with as little overhead as possible.
- * 
+ *
  * We take full advantage of hardware support for IP checksum and
  * fragmentation offloading.
  *

Modified: head/sys/netinet/ip_fw.h
==============================================================================
--- head/sys/netinet/ip_fw.h    Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/ip_fw.h    Wed Feb 12 13:31:36 2020        (r357818)
@@ -34,7 +34,7 @@
  * The default rule number.  By the design of ip_fw, the default rule
  * is the last one, so its number can also serve as the highest number
  * allowed for a rule.  The ip_fw code relies on both meanings of this
- * constant. 
+ * constant.
  */
 #define        IPFW_DEFAULT_RULE       65535
 
@@ -239,7 +239,7 @@ enum ipfw_opcodes {         /* arguments (4 byte each)      
*/
        O_FORWARD_MAC,          /* fwd mac                      */
        O_NAT,                  /* nope                         */
        O_REASS,                /* none                         */
-       
+
        /*
         * More opcodes.
         */
@@ -277,7 +277,7 @@ enum ipfw_opcodes {         /* arguments (4 byte each)      
*/
 
        O_SETFIB,               /* arg1=FIB number */
        O_FIB,                  /* arg1=FIB desired fib number */
-       
+
        O_SOCKARG,              /* socket argument */
 
        O_CALLRETURN,           /* arg1=called rule number */
@@ -485,9 +485,9 @@ struct cfg_redir {
        u_short                 pport_cnt;      /* number of public ports */
        u_short                 rport_cnt;      /* number of remote ports */
        int                     proto;          /* protocol: tcp/udp */
-       struct alias_link       **alink;        
+       struct alias_link       **alink;
        /* num of entry in spool chain */
-       u_int16_t               spool_cnt;      
+       u_int16_t               spool_cnt;
        /* chain of spool instances */
        LIST_HEAD(spool_chain, cfg_spool) spool_chain;
 };
@@ -504,9 +504,9 @@ struct cfg_nat {
        int                     mode;                   /* aliasing mode */
        struct libalias         *lib;                   /* libalias instance */
        /* number of entry in spool chain */
-       int                     redir_cnt;              
+       int                     redir_cnt;
        /* chain of redir instances */
-       LIST_HEAD(redir_chain, cfg_redir) redir_chain;  
+       LIST_HEAD(redir_chain, cfg_redir) redir_chain;
 };
 #endif
 
@@ -537,7 +537,7 @@ struct nat44_cfg_redir {
        uint16_t        pport_cnt;      /* number of public ports */
        uint16_t        rport_cnt;      /* number of remote ports */
        uint16_t        mode;           /* type of redirect mode */
-       uint16_t        spool_cnt;      /* num of entry in spool chain */ 
+       uint16_t        spool_cnt;      /* num of entry in spool chain */
        uint16_t        spare;
        uint32_t        proto;          /* protocol: tcp/udp */
 };
@@ -555,7 +555,7 @@ struct nat44_cfg_nat {
 /* Nat command. */
 typedef struct _ipfw_insn_nat {
        ipfw_insn       o;
-       struct cfg_nat *nat;    
+       struct cfg_nat *nat;
 } ipfw_insn_nat;
 
 /* Apply ipv6 mask on ipv6 addr */
@@ -579,7 +579,7 @@ typedef struct _ipfw_insn_icmp6 {
        uint32_t d[7]; /* XXX This number si related to the netinet/icmp6.h
                        *     define ICMP6_MAXTYPE
                        *     as follows: n = ICMP6_MAXTYPE/32 + 1
-                        *     Actually is 203 
+                        *     Actually is 203
                        */
 } ipfw_insn_icmp6;
 
@@ -900,7 +900,7 @@ typedef struct      _ipfw_obj_tentry {
                uint32_t                key;            /* uid/gid/port */
                struct in6_addr         addr6;  /* IPv6 address         */
                char    iface[IF_NAMESIZE];     /* interface name       */
-               struct tflow_entry      flow;   
+               struct tflow_entry      flow;
        } k;
        union {
                ipfw_table_value        value;  /* value data */

Modified: head/sys/netinet/ip_icmp.c
==============================================================================
--- head/sys/netinet/ip_icmp.c  Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/ip_icmp.c  Wed Feb 12 13:31:36 2020        (r357818)
@@ -563,7 +563,7 @@ icmp_input(struct mbuf **mp, int *offp, int proto)
                 * - The outer IP header has no options.
                 * - The outer IP header, the ICMP header, the inner IP header,
                 *   and the first n bytes of the inner payload are contiguous.
-                *   n is at least 8, but might be larger based on 
+                *   n is at least 8, but might be larger based on
                 *   ICMP_ADVLENPREF. See its definition in ip_icmp.h.
                 */
                ctlfunc = inetsw[ip_protox[icp->icmp_ip.ip_p]].pr_ctlinput;
@@ -629,7 +629,7 @@ icmp_input(struct mbuf **mp, int *offp, int proto)
                            (struct sockaddr *)&icmpdst, m->m_pkthdr.rcvif);
                if (ia == NULL)
                        break;
-               if (ia->ia_ifp == NULL) 
+               if (ia->ia_ifp == NULL)
                        break;
                icp->icmp_type = ICMP_MASKREPLY;
                if (V_icmpmaskfake == 0)
@@ -937,7 +937,7 @@ done:
  *
  * @src: sockaddr with address of redirect originator
  * @dst: sockaddr with destination in question
- * @gateway: new proposed gateway 
+ * @gateway: new proposed gateway
  *
  * Returns 0 on success.
  */

Modified: head/sys/netinet/ip_id.c
==============================================================================
--- head/sys/netinet/ip_id.c    Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/ip_id.c    Wed Feb 12 13:31:36 2020        (r357818)
@@ -280,7 +280,7 @@ ipid_sysinit(void)
 
        mtx_init(&V_ip_id_mtx, "ip_id_mtx", NULL, MTX_DEF);
        V_ip_id = counter_u64_alloc(M_WAITOK);
-       
+
        CPU_FOREACH(i)
                arc4rand(zpcpu_get_cpu(V_ip_id, i), sizeof(uint64_t), 0);
 }

Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/ip_input.c Wed Feb 12 13:31:36 2020        (r357818)
@@ -639,12 +639,12 @@ passin:
                return;
 
         /* greedy RSVP, snatches any PATH packet of the RSVP protocol and no
-         * matter if it is destined to another node, or whether it is 
+         * matter if it is destined to another node, or whether it is
          * a multicast one, RSVP wants it! and prevents it from being forwarded
          * anywhere else. Also checks if the rsvp daemon is running before
         * grabbing the packet.
          */
-       if (V_rsvp_on && ip->ip_p==IPPROTO_RSVP) 
+       if (V_rsvp_on && ip->ip_p==IPPROTO_RSVP)
                goto ours;
 
        /*
@@ -675,7 +675,7 @@ passin:
         * insert a workaround. If the packet got here, we already
         * checked with carp_iamatch() and carp_forus().
         */
-       checkif = V_ip_checkinterface && (V_ipforwarding == 0) && 
+       checkif = V_ip_checkinterface && (V_ipforwarding == 0) &&
            ifp != NULL && ((ifp->if_flags & IFF_LOOPBACK) == 0) &&
            ifp->if_carp == NULL && (dchg == 0);
 
@@ -689,7 +689,7 @@ passin:
                 * arrived via the correct interface if checking is
                 * enabled.
                 */
-               if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr && 
+               if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr &&
                    (!checkif || ia->ia_ifp == ifp)) {
                        counter_u64_add(ia->ia_ifa.ifa_ipackets, 1);
                        counter_u64_add(ia->ia_ifa.ifa_ibytes,
@@ -1282,7 +1282,7 @@ ip_savecontrol(struct inpcb *inp, struct mbuf **mp, st
                        }
                        bcopy(sdp, sdl2, sdp->sdl_len);
                } else {
-makedummy:     
+makedummy:
                        sdl2->sdl_len =
                            offsetof(struct sockaddr_dl, sdl_data[0]);
                        sdl2->sdl_family = AF_LINK;
@@ -1408,13 +1408,13 @@ rsvp_input(struct mbuf **mp, int *offp, int proto)
         * of the group to which the RSVP packet is addressed.  But in this
         * case we want to throw the packet away.
         */
-       
+
        if (!V_rsvp_on) {
                m_freem(m);
                return (IPPROTO_DONE);
        }
 
-       if (V_ip_rsvpd != NULL) { 
+       if (V_ip_rsvpd != NULL) {
                *mp = m;
                rip_input(mp, offp, proto);
                return (IPPROTO_DONE);

Modified: head/sys/netinet/ip_mroute.c
==============================================================================
--- head/sys/netinet/ip_mroute.c        Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/ip_mroute.c        Wed Feb 12 13:31:36 2020        
(r357818)
@@ -182,7 +182,7 @@ VNET_DEFINE_STATIC(vifi_t, numvifs);
 VNET_DEFINE_STATIC(struct vif *, viftable);
 #define        V_viftable              VNET(viftable)
 /*
- * No one should be able to "query" this before initialisation happened in 
+ * No one should be able to "query" this before initialisation happened in
  * vnet_mroute_init(), so we should still be fine.
  */
 SYSCTL_OPAQUE(_net_inet_ip, OID_AUTO, viftable, CTLFLAG_VNET | CTLFLAG_RD,
@@ -653,7 +653,7 @@ if_detached_event(void *arg __unused, struct ifnet *if
 
     MROUTER_UNLOCK();
 }
-                        
+
 /*
  * Enable multicast forwarding.
  */
@@ -742,7 +742,7 @@ X_ip_mrouter_done(void)
     bzero((caddr_t)V_viftable, sizeof(V_viftable));
     V_numvifs = 0;
     V_pim_assert_enabled = 0;
-    
+
     VIF_UNLOCK();
 
     callout_stop(&V_expire_upcalls_ch);
@@ -2833,7 +2833,7 @@ vnet_mroute_uninit(const void *unused __unused)
        V_nexpire = NULL;
 }
 
-VNET_SYSUNINIT(vnet_mroute_uninit, SI_SUB_PROTO_MC, SI_ORDER_MIDDLE, 
+VNET_SYSUNINIT(vnet_mroute_uninit, SI_SUB_PROTO_MC, SI_ORDER_MIDDLE,
        vnet_mroute_uninit, NULL);
 
 static int
@@ -2844,7 +2844,7 @@ ip_mroute_modevent(module_t mod, int type, void *unuse
     case MOD_LOAD:
        MROUTER_LOCK_INIT();
 
-       if_detach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event, 
+       if_detach_event_tag = EVENTHANDLER_REGISTER(ifnet_departure_event,
            if_detached_event, NULL, EVENTHANDLER_PRI_ANY);
        if (if_detach_event_tag == NULL) {
                printf("ip_mroute: unable to register "

Modified: head/sys/netinet/ip_options.c
==============================================================================
--- head/sys/netinet/ip_options.c       Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/ip_options.c       Wed Feb 12 13:31:36 2020        
(r357818)
@@ -75,8 +75,8 @@ SYSCTL_INT(_net_inet_ip, IPCTL_SOURCEROUTE, sourcerout
 #define        V_ip_dosourceroute      VNET(ip_dosourceroute)
 
 VNET_DEFINE_STATIC(int,        ip_acceptsourceroute);
-SYSCTL_INT(_net_inet_ip, IPCTL_ACCEPTSOURCEROUTE, accept_sourceroute, 
-    CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip_acceptsourceroute), 0, 
+SYSCTL_INT(_net_inet_ip, IPCTL_ACCEPTSOURCEROUTE, accept_sourceroute,
+    CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(ip_acceptsourceroute), 0,
     "Enable accepting source routed IP packets");
 #define        V_ip_acceptsourceroute  VNET(ip_acceptsourceroute)
 
@@ -208,7 +208,7 @@ ip_dooptions(struct mbuf *m, int pass)
                                         * ICMP
                                         */
 nosourcerouting:
-                                       log(LOG_WARNING, 
+                                       log(LOG_WARNING,
                                            "attempted source route from %s "
                                            "to %s\n",
                                            inet_ntoa_r(ip->ip_src, srcbuf),

Modified: head/sys/netinet/ip_reass.c
==============================================================================
--- head/sys/netinet/ip_reass.c Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/ip_reass.c Wed Feb 12 13:31:36 2020        (r357818)
@@ -637,7 +637,7 @@ ipreass_cleanup(void *arg __unused, struct ifnet *ifp)
        /*
         * Skip processing if IPv4 reassembly is not initialised or
         * torn down by ipreass_destroy().
-        */ 
+        */
        if (V_ipq_zone == NULL) {
                CURVNET_RESTORE();
                return;
@@ -750,7 +750,7 @@ sysctl_maxfragpackets(SYSCTL_HANDLER_ARGS)
                max = uma_zone_get_max(V_ipq_zone);
                if (max == 0)
                        max = -1;
-       } else 
+       } else
                max = 0;
        error = sysctl_handle_int(oidp, &max, 0, req);
        if (error || !req->newptr)

Modified: head/sys/netinet/raw_ip.c
==============================================================================
--- head/sys/netinet/raw_ip.c   Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/raw_ip.c   Wed Feb 12 13:31:36 2020        (r357818)
@@ -160,7 +160,7 @@ rip_inshash(struct inpcb *inp)
 
        INP_INFO_WLOCK_ASSERT(pcbinfo);
        INP_WLOCK_ASSERT(inp);
-       
+
        if (inp->inp_ip_p != 0 &&
            inp->inp_laddr.s_addr != INADDR_ANY &&
            inp->inp_faddr.s_addr != INADDR_ANY) {
@@ -892,7 +892,7 @@ rip_detach(struct socket *so)
 
        inp = sotoinpcb(so);
        KASSERT(inp != NULL, ("rip_detach: inp == NULL"));
-       KASSERT(inp->inp_faddr.s_addr == INADDR_ANY, 
+       KASSERT(inp->inp_faddr.s_addr == INADDR_ANY,
            ("rip_detach: not closed"));
 
        INP_INFO_WLOCK(&V_ripcbinfo);

Modified: head/sys/netinet/siftr.c
==============================================================================
--- head/sys/netinet/siftr.c    Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/siftr.c    Wed Feb 12 13:31:36 2020        (r357818)
@@ -235,9 +235,9 @@ struct pkt_node {
        /* Number of segments currently in the reassembly queue. */
        int                     t_segqlen;
        /* Flowid for the connection. */
-       u_int                   flowid; 
+       u_int                   flowid;
        /* Flow type for the connection. */
-       u_int                   flowtype;       
+       u_int                   flowtype;
        /* Link to next pkt_node in the list. */
        STAILQ_ENTRY(pkt_node)  nodes;
 };
@@ -1103,7 +1103,7 @@ siftr_chkpkt6(struct mbuf **m, struct ifnet *ifp, int 
         * Only pkts selected by the tcp port filter
         * can be inserted into the pkt_queue
         */
-       if ((siftr_port_filter != 0) && 
+       if ((siftr_port_filter != 0) &&
            (siftr_port_filter != ntohs(inp->inp_lport)) &&
            (siftr_port_filter != ntohs(inp->inp_fport))) {
                goto inp_unlock6;

Modified: head/sys/netinet/tcp.h
==============================================================================
--- head/sys/netinet/tcp.h      Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/tcp.h      Wed Feb 12 13:31:36 2020        (r357818)
@@ -333,7 +333,7 @@ struct tcp_info {
        u_int32_t       tcpi_snd_rexmitpack;    /* Retransmitted packets */
        u_int32_t       tcpi_rcv_ooopack;       /* Out-of-order packets */
        u_int32_t       tcpi_snd_zerowin;       /* Zero-sized windows sent */
-       
+
        /* Padding to grow without breaking ABI. */
        u_int32_t       __tcpi_pad[26];         /* Padding. */
 };

Modified: head/sys/netinet/tcp_fastopen.c
==============================================================================
--- head/sys/netinet/tcp_fastopen.c     Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/tcp_fastopen.c     Wed Feb 12 13:31:36 2020        
(r357818)
@@ -386,7 +386,7 @@ void
 tcp_fastopen_init(void)
 {
        unsigned int i;
-       
+
        V_counter_zone = uma_zcreate("tfo", sizeof(unsigned int),
            NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
        rm_init(&V_tcp_fastopen_keylock, "tfo_keylock");
@@ -450,7 +450,7 @@ tcp_fastopen_destroy(void)
        struct tcp_fastopen_ccache_bucket *ccb;
        unsigned int i;
 
-       for (i = 0; i < V_tcp_fastopen_ccache.buckets; i++) {           
+       for (i = 0; i < V_tcp_fastopen_ccache.buckets; i++) {
                ccb = &V_tcp_fastopen_ccache.base[i];
                tcp_fastopen_ccache_bucket_trim(ccb, 0);
                mtx_destroy(&ccb->ccb_mtx);
@@ -807,7 +807,7 @@ sysctl_net_inet_tcp_fastopen_ccache_bucket_limit(SYSCT
        int error;
        unsigned int new;
        unsigned int i;
-       
+
        new = V_tcp_fastopen_ccache.bucket_limit;
        error = sysctl_handle_int(oidp, &new, 0, req);
        if (error == 0 && req->newptr) {
@@ -823,7 +823,7 @@ sysctl_net_inet_tcp_fastopen_ccache_bucket_limit(SYSCT
                        }
                        V_tcp_fastopen_ccache.bucket_limit = new;
                }
-                       
+
        }
        return (error);
 }
@@ -860,7 +860,7 @@ sysctl_net_inet_tcp_fastopen_client_enable(SYSCTL_HAND
                                        ccb->ccb_num_entries));
                                ccb->ccb_num_entries = 0; /* enable bucket */
                                CCB_UNLOCK(ccb);
-                       }                       
+                       }
                        V_tcp_fastopen_client_enable = 1;
                }
        }
@@ -876,7 +876,7 @@ tcp_fastopen_connect(struct tcpcb *tp)
        sbintime_t now;
        uint16_t server_mss;
        uint64_t psk_cookie;
-       
+
        psk_cookie = 0;
        inp = tp->t_inpcb;
        cce = tcp_fastopen_ccache_lookup(&inp->inp_inc, &ccb);
@@ -1032,7 +1032,7 @@ tcp_fastopen_ccache_lookup(struct in_conninfo *inc,
        ccb = &V_tcp_fastopen_ccache.base[hash & V_tcp_fastopen_ccache.mask];
        *ccbp = ccb;
        CCB_LOCK(ccb);
-       
+
        /*
         * Always returns with locked bucket.
         */
@@ -1055,7 +1055,7 @@ tcp_fastopen_ccache_create(struct tcp_fastopen_ccache_
     struct in_conninfo *inc, uint16_t mss, uint8_t cookie_len, uint8_t *cookie)
 {
        struct tcp_fastopen_ccache_entry *cce;
-       
+
        /*
         * 1. Create a new entry, or
         * 2. Reclaim an existing entry, or
@@ -1063,7 +1063,7 @@ tcp_fastopen_ccache_create(struct tcp_fastopen_ccache_
         */
 
        CCB_LOCK_ASSERT(ccb);
-       
+
        cce = NULL;
        if (ccb->ccb_num_entries < V_tcp_fastopen_ccache.bucket_limit)
                cce = uma_zalloc(V_tcp_fastopen_ccache.zone, M_NOWAIT);
@@ -1106,7 +1106,7 @@ tcp_fastopen_ccache_create(struct tcp_fastopen_ccache_
                cce->cookie_len = 0;
                cce->disable_time = getsbinuptime();
        }
-       
+
        return (cce);
 }
 
@@ -1116,7 +1116,7 @@ tcp_fastopen_ccache_bucket_trim(struct tcp_fastopen_cc
 {
        struct tcp_fastopen_ccache_entry *cce, *cce_tmp;
        unsigned int entries;
-       
+
        CCB_LOCK(ccb);
        entries = 0;
        TAILQ_FOREACH_SAFE(cce, &ccb->ccb_entries, cce_link, cce_tmp) {

Modified: head/sys/netinet/tcp_fsm.h
==============================================================================
--- head/sys/netinet/tcp_fsm.h  Wed Feb 12 13:07:09 2020        (r357817)
+++ head/sys/netinet/tcp_fsm.h  Wed Feb 12 13:31:36 2020        (r357818)
@@ -97,7 +97,7 @@ static u_char tcp_outflags[TCP_NSTATES] = {
        TH_FIN|TH_ACK,          /* 8, LAST_ACK */
        TH_ACK,                 /* 9, FIN_WAIT_2 */
        TH_ACK,                 /* 10, TIME_WAIT */
-};     
+};
 #endif
 
 #ifdef KPROF

Modified: head/sys/netinet/tcp_input.c
==============================================================================
--- head/sys/netinet/tcp_input.c        Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/tcp_input.c        Wed Feb 12 13:31:36 2020        
(r357818)
@@ -369,7 +369,7 @@ cc_ack_received(struct tcpcb *tp, struct tcphdr *th, u
 #endif
 }
 
-void 
+void
 cc_conn_init(struct tcpcb *tp)
 {
        struct hc_metrics_lite metrics;
@@ -1687,7 +1687,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
            th->th_seq == tp->rcv_nxt &&
            (thflags & (TH_SYN|TH_FIN|TH_RST|TH_URG|TH_ACK)) == TH_ACK &&
            tp->snd_nxt == tp->snd_max &&
-           tiwin && tiwin == tp->snd_wnd && 
+           tiwin && tiwin == tp->snd_wnd &&
            ((tp->t_flags & (TF_NEEDSYN|TF_NEEDFIN)) == 0) &&
            SEGQ_EMPTY(tp) &&
            ((to.to_flags & TOF_TS) == 0 ||
@@ -1764,7 +1764,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
                                if (SEQ_GT(tp->snd_una, tp->snd_recover) &&
                                    SEQ_LEQ(th->th_ack, tp->snd_recover))
                                        tp->snd_recover = th->th_ack - 1;
-                               
+
                                /*
                                 * Let the congestion control algorithm update
                                 * congestion control related information. This
@@ -1908,7 +1908,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
                                goto dropwithreset;
                        } else if (thflags & TH_SYN) {
                                /* non-initial SYN is ignored */
-                               if ((tcp_timer_active(tp, TT_DELACK) || 
+                               if ((tcp_timer_active(tp, TT_DELACK) ||
                                     tcp_timer_active(tp, TT_REXMT)))
                                        goto drop;
                        } else if (!(thflags & (TH_ACK|TH_FIN|TH_RST))) {
@@ -1985,7 +1985,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
                                tp->t_flags2 |= TF2_ECN_PERMIT;
                                TCPSTAT_INC(tcps_ecn_shs);
                        }
-                       
+
                        /*
                         * Received <SYN,ACK> in SYN_SENT[*] state.
                         * Transitions:
@@ -2300,14 +2300,14 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
        /*
         * If last ACK falls within this segment's sequence numbers,
         * record its timestamp.
-        * NOTE: 
+        * NOTE:
         * 1) That the test incorporates suggestions from the latest
         *    proposal of the [email protected] list (Braden 1993/04/26).
         * 2) That updating only on newer timestamps interferes with
         *    our earlier PAWS tests, so this check should be solely
         *    predicated on the sequence space of this segment.
-        * 3) That we modify the segment boundary check to be 
-        *        Last.ACK.Sent <= SEG.SEQ + SEG.Len  
+        * 3) That we modify the segment boundary check to be
+        *        Last.ACK.Sent <= SEG.SEQ + SEG.Len
         *    instead of RFC1323's
         *        Last.ACK.Sent < SEG.SEQ + SEG.Len,
         *    This modified check allows us to overcome RFC1323's
@@ -2376,7 +2376,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
                        /*
                         * Account for the ACK of our SYN prior to
                         * regular ACK processing below.
-                        */ 
+                        */
                        tp->snd_una++;
                }
                if (tp->t_flags & TF_NEEDFIN) {
@@ -2511,10 +2511,10 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, stru
                                        if ((tp->t_flags & TF_SACK_PERMIT) &&
                                            IN_FASTRECOVERY(tp->t_flags)) {
                                                int awnd;
-                                               
+
                                                /*
                                                 * Compute the amount of data 
in flight first.
-                                                * We can inject new data into 
the pipe iff 
+                                                * We can inject new data into 
the pipe iff
                                                 * we have less than 1/2 the 
original window's
                                                 * worth of data in flight.
                                                 */

Modified: head/sys/netinet/tcp_log_buf.c
==============================================================================
--- head/sys/netinet/tcp_log_buf.c      Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/tcp_log_buf.c      Wed Feb 12 13:31:36 2020        
(r357818)
@@ -648,7 +648,7 @@ restart:
                        KASSERT(bucket_locked || tlb == NULL,
                            ("%s: bucket_locked (%d) and tlb (%p) are "
                            "inconsistent", __func__, bucket_locked, tlb));
-                       
+
                        if (bucket_locked) {
                                TCPID_BUCKET_UNLOCK(tlb);
                                bucket_locked = false;
@@ -728,7 +728,7 @@ refind:
                 * Remember that we constructed (struct tcp_log_id_node) so
                 * we can safely cast the id to it for the purposes of finding.
                 */
-               KASSERT(tlb == NULL, ("%s:%d tlb unexpectedly non-NULL", 
+               KASSERT(tlb == NULL, ("%s:%d tlb unexpectedly non-NULL",
                    __func__, __LINE__));
                tmp_tlb = RB_FIND(tcp_log_id_tree, &tcp_log_id_head,
                    (struct tcp_log_id_bucket *) id);
@@ -1351,7 +1351,7 @@ tcp_log_tcpcbfini(struct tcpcb *tp)
         * There are two ways we could keep logs: per-socket or per-ID. If
         * we are tracking logs with an ID, then the logs survive the
         * destruction of the TCPCB.
-        * 
+        *
         * If the TCPCB is associated with an ID node, move the logs from the
         * TCPCB to the ID node. In theory, this is safe, for reasons which I
         * will now explain for my own benefit when I next need to figure out
@@ -1361,7 +1361,7 @@ tcp_log_tcpcbfini(struct tcpcb *tp)
         * of this node (Rule C). Further, no one can remove this node from
         * the bucket while we hold the lock (Rule D). Basically, no one can
         * mess with this node. That leaves two states in which we could be:
-        * 
+        *
         * 1. Another thread is currently waiting to acquire the INP lock, with
         *    plans to do something with this node. When we drop the INP lock,
         *    they will have a chance to do that. They will recheck the
@@ -1770,7 +1770,7 @@ tcp_log_state_change(struct tcpcb *tp, int state)
        if (tcp_disable_all_bb_logs) {
                /* We are prohibited from doing any logs */
                tp->t_logstate = TCP_LOG_STATE_OFF;
-       }       
+       }
        tp->t_flags2 &= ~(TF2_LOG_AUTO);
 
        return (0);
@@ -2110,7 +2110,7 @@ tcp_log_expandlogbuf(struct tcp_log_dev_queue *param)
        sopt.sopt_val = hdr + 1;
        sopt.sopt_valsize -= sizeof(struct tcp_log_header);
        sopt.sopt_td = NULL;
-       
+
        error = tcp_log_logs_to_buf(&sopt, &entry->tldl_entries,
            (struct tcp_log_buffer **)&end, entry->tldl_count);
        if (error) {
@@ -2380,7 +2380,7 @@ tcp_log_dumpbucketlogs(struct tcp_log_id_bucket *tlb, 
                 * If this isn't associated with a TCPCB, we can pull it off
                 * the list now. We need to be careful that the expire timer
                 * hasn't already taken ownership (tln_expiretime == SBT_MAX).
-                * If so, we let the expire timer code free the data. 
+                * If so, we let the expire timer code free the data.
                 */
                if (cur_tln->tln_closed) {
 no_inp:
@@ -2618,7 +2618,7 @@ tcp_log_dump_tp_bucket_logbufs(struct tcpcb *tp, char 
                return;
        }
 
-       /* Turn this over to tcp_log_dumpbucketlogs() to finish the work. */ 
+       /* Turn this over to tcp_log_dumpbucketlogs() to finish the work. */
        tcp_log_dumpbucketlogs(tlb, reason);
 }
 

Modified: head/sys/netinet/tcp_log_buf.h
==============================================================================
--- head/sys/netinet/tcp_log_buf.h      Wed Feb 12 13:07:09 2020        
(r357817)
+++ head/sys/netinet/tcp_log_buf.h      Wed Feb 12 13:31:36 2020        
(r357818)
@@ -305,7 +305,7 @@ struct tcp_log_dev_log_queue {
  * information when needed.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to