From nobody Mon Feb  7 13:51:59 2022
X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BBA4919AA9D0;
	Mon,  7 Feb 2022 13:52:01 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4Jsncw2m5Tz4xs2;
	Mon,  7 Feb 2022 13:52:00 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1644241921;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=dXVe2Ca5VukmuzVjnnoFLL4J9CNAELNXLR3WdFFDYWQ=;
	b=TvLghlpJwX7IR2Y4Ml93xQZOs6x1iu7xdbhYgF1yJ3giLnMQ6NxeD0pswMXo0yxHWDWzb7
	uPlCD11STCoytGRiuJzZpa0W0apWDcSDED6m1QhV5Ul3Ay1pnrQXTk1tySf0uErjxF/qLM
	ArMgYQnUIEpvQEoWkwHJB2CDRj6gSIALrO2eIwhQ4YRWZBPoG3suI/eAusRiP1oScUW/cg
	g0EOnrKeNjWGXH9djpCS7rLlPV3/qSfyu4KJMYOQ6+kwJljeOlWcbK9MuDqUQJOihLAvIm
	4x+kQYBPSYqH1Nkb7w2VdlJKF4lKscZY0nba7QwqbbOAtdLY3M9cs8zNRMRBcw==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1543E267F9;
	Mon,  7 Feb 2022 13:51:59 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 217Dpxm0079532;
	Mon, 7 Feb 2022 13:51:59 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217DpxUW079531;
	Mon, 7 Feb 2022 13:51:59 GMT
	(envelope-from git)
Date: Mon, 7 Feb 2022 13:51:59 GMT
Message-Id: <202202071351.217DpxUW079531@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-branches@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: d10d5bc1cc6b - stable/13 - ipfilter module: Remove trailing whitespace
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: d10d5bc1cc6bb2d871151e65409d7fecdada61a1
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1644241921;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=dXVe2Ca5VukmuzVjnnoFLL4J9CNAELNXLR3WdFFDYWQ=;
	b=RjerPjvRp5HWEs+o+t4ZiUSMjALlRagqYEiUU2mfttjaSkdmrKKhAe+ljkWWvPHUb4sLOq
	d09CJMnArNMNSU7QuOkIDmZ6B293A5GRCl9vt0Uug7Zk4jltHRZ5IyvuBMXj/NgIHCuWpG
	6FRpmlPyvoBab4s6o165FY6AIQ8Z2wmZ93Gyzq2+XM0w0cVr1AGKOJUpAJq/X30yLnaAwE
	Lr2QcabVIoGNXhMMRjr5oPCHu7EnFcr7Pz5C7b1eS8yvquO9ieu/oKtrHG4tAdgaHdpmqD
	zZGCU8Qzt0O0KTz7M2/bzjUNeO89RtFnobuhQ5jLpbcGAod1Sk10FIsu6JaM1g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644241921; a=rsa-sha256; cv=none;
	b=O83hjSKv9p98bs+M6fTCgNTZYX/nzicNspIgf/wO+ClprPEKRmpF72kN6Y0YO8C1/F68bM
	lvo+ggzt3DddlraIkmwLcdLEkjaUDzuIS4KR7TkVXDaimHNyZA7LQTtZ7f+dz3Y2sHE/Ne
	kt8TUh8IJmIx5E4D76DgGqsUS0gnJTByUpBAQ5C7BI3TBvY/mdY361X6TAXejqjExidhDU
	0LsJbDHLHO3YaSt7zax4maO/04VDWiLV1bnpcVqjB76RnJ/Zea9XPiZGIVz5jl6sesx3Wb
	5Alsgau/Gw9SlqEH5I7VVDqiI60iSfS89VqQEs1FUXeYuFRgYuEdGKHRlj+VAQ==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch stable/13 has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=d10d5bc1cc6bb2d871151e65409d7fecdada61a1

commit d10d5bc1cc6bb2d871151e65409d7fecdada61a1
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-12-22 03:06:01 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-02-07 13:51:16 +0000

    ipfilter module: Remove trailing whitespace
    
    (cherry picked from commit 2eef572879afe0309e3c538017c7909c1b7307d0)
---
 sys/netpfil/ipfilter/netinet/ip_fil.h      | 2 +-
 sys/netpfil/ipfilter/netinet/ip_nat6.c     | 4 ++--
 sys/netpfil/ipfilter/netinet/ip_proxy.c    | 8 ++++----
 sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h
index a01bd28e7270..bf553faf2abe 100644
--- a/sys/netpfil/ipfilter/netinet/ip_fil.h
+++ b/sys/netpfil/ipfilter/netinet/ip_fil.h
@@ -694,7 +694,7 @@ typedef	struct	frentry {
 	int	fr_group;	/* group to which this rule belongs */
 	int	fr_grhead;	/* group # which this rule starts */
 	int	fr_isctag;
-	int	fr_rpc;		/* XID Filtering */ 
+	int	fr_rpc;		/* XID Filtering */
 	ipftag_t fr_nattag;
 	/*
 	 * These are all options related to stateful filtering
diff --git a/sys/netpfil/ipfilter/netinet/ip_nat6.c b/sys/netpfil/ipfilter/netinet/ip_nat6.c
index ee45784ccd51..92f530031f5c 100644
--- a/sys/netpfil/ipfilter/netinet/ip_nat6.c
+++ b/sys/netpfil/ipfilter/netinet/ip_nat6.c
@@ -313,8 +313,8 @@ ipf_nat6_delrdr(ipf_nat_softc_t *softn, ipnat_t *n)
 	*n->in_prnext = n->in_rnext;
 	n->in_use--;
 }
-                                        
-                       
+
+
 /* ------------------------------------------------------------------------ */
 /* Function:    ipf_nat6_delmap                                             */
 /* Returns:     Nil                                                         */
diff --git a/sys/netpfil/ipfilter/netinet/ip_proxy.c b/sys/netpfil/ipfilter/netinet/ip_proxy.c
index 8d9e67243e8a..dfba2263b085 100644
--- a/sys/netpfil/ipfilter/netinet/ip_proxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_proxy.c
@@ -1265,7 +1265,7 @@ ipf_proxy_fixseqack(fr_info_t *fin, ip_t *ip, ap_session_t *aps, int inc)
 /*                                                                          */
 /* This function creates a NAT rule that is based upon the reverse packet   */
 /* flow associated with this NAT session. Thus if this NAT session was      */
-/* created with a map rule then this function will create a rdr rule.       */ 
+/* created with a map rule then this function will create a rdr rule.       */
 /* Only address fields and network interfaces are assigned in this function */
 /* and the address fields are formed such that an exact is required. If the */
 /* original rule had a netmask, that is not replicated here not is it       */
@@ -1275,7 +1275,7 @@ ipf_proxy_fixseqack(fr_info_t *fin, ip_t *ip, ap_session_t *aps, int inc)
 /* to be setup, based on the addresses used for the control connection. In  */
 /* that case, this function is used to handle creating NAT rules to support */
 /* data connections with the PORT and EPRT commands.                        */
-/* ------------------------------------------------------------------------ */ 
+/* ------------------------------------------------------------------------ */
 ipnat_t *
 ipf_proxy_rule_rev(nat_t *nat)
 {
@@ -1358,11 +1358,11 @@ ipf_proxy_rule_rev(nat_t *nat)
 /*                                                                          */
 /* The purpose and rationale of this function is much the same as the above */
 /* function, ipf_proxy_rule_rev, except that a rule is created that matches */
-/* the same direction as that of the existing NAT session. Thus if this NAT */ 
+/* the same direction as that of the existing NAT session. Thus if this NAT */
 /* session was created with a map rule then this function will also create  */
 /* a data structure to represent a map rule. Whereas ipf_proxy_rule_rev is  */
 /* used to support PORT/EPRT, this function supports PASV/EPSV.             */
-/* ------------------------------------------------------------------------ */ 
+/* ------------------------------------------------------------------------ */
 ipnat_t *
 ipf_proxy_rule_fwd(nat_t *nat)
 {
diff --git a/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c b/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c
index de046f64f0b4..2ba51f3272af 100644
--- a/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c
+++ b/sys/netpfil/ipfilter/netinet/ip_tftp_pxy.c
@@ -420,7 +420,7 @@ ipf_p_tftp_client(ipf_tftp_softc_t *softt, fr_info_t *fin, ap_session_t *aps,
 	switch (opcode)
 	{
 	case TFTP_CMD_WRITE :
-		if (softt->ipf_p_tftp_readonly != 0) 
+		if (softt->ipf_p_tftp_readonly != 0)
 			break;
 		/* FALLTHROUGH */
 	case TFTP_CMD_READ :