git: 7f527d48124b - main - iflib: Fix white space and reduce some line lengths

The branch main has been updated by erj:

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

commit 7f527d48124bd03fcfb946ce2d5d0c7bc71e099d
Author:     Eric Joyner <erj@FreeBSD.org>
AuthorDate: 2023-08-04 17:53:29 +0000
Commit:     Eric Joyner <erj@FreeBSD.org>
CommitDate: 2023-08-07 22:46:48 +0000

    iflib: Fix white space and reduce some line lengths
    
    This helps align some of the code with the rest of the style used in
    iflib, but as marius@ points out, this is not style(9).
    
    Signed-off-by: Eric Joyner <erj@FreeBSD.org>
    
    Reviewed by:    kbowling@
    MFC after:      3 days
    Sponsored by:   Intel Corporation
    Differential Revision:  https://reviews.freebsd.org/D41324
---
 sys/net/iflib.c | 18 ++++++++++--------
 sys/net/iflib.h |  7 +++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/sys/net/iflib.c b/sys/net/iflib.c
index 9e6964d73764..f4c0e5d54cab 100644
--- a/sys/net/iflib.c
+++ b/sys/net/iflib.c
@@ -211,6 +211,7 @@ struct iflib_ctx {
 #define isc_legacy_intr ifc_txrx.ift_legacy_intr
 #define isc_txq_select ifc_txrx.ift_txq_select
 #define isc_txq_select_v2 ifc_txrx.ift_txq_select_v2
+
 	eventhandler_tag ifc_vlan_attach_event;
 	eventhandler_tag ifc_vlan_detach_event;
 	struct ether_addr ifc_mac;
@@ -1953,7 +1954,7 @@ iflib_rxsd_alloc(iflib_rxq_t rxq)
 	lowaddr = DMA_WIDTH_TO_BUS_LOWADDR(scctx->isc_dma_width);
 
 	fl = rxq->ifr_fl;
-	for (int i = 0; i <  rxq->ifr_nfl; i++, fl++) {
+	for (int i = 0; i < rxq->ifr_nfl; i++, fl++) {
 		fl->ifl_size = scctx->isc_nrxd[rxq->ifr_fl_offset]; /* this isn't necessarily the same */
 		/* Set up DMA tag for RX buffers. */
 		err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */
@@ -6280,7 +6281,8 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid,
 }
 
 void
-iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, void *arg, int qid, const char *name)
+iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type,
+			    void *arg, int qid, const char *name)
 {
 	device_t dev;
 	struct grouptask *gtask;
@@ -6777,16 +6779,16 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx)
 
 	SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_ntxqs",
 		       CTLFLAG_RWTUN, &ctx->ifc_sysctl_ntxqs, 0,
-			"# of txqs to use, 0 => use default #");
+		       "# of txqs to use, 0 => use default #");
 	SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_nrxqs",
 		       CTLFLAG_RWTUN, &ctx->ifc_sysctl_nrxqs, 0,
-			"# of rxqs to use, 0 => use default #");
+		       "# of rxqs to use, 0 => use default #");
 	SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_qs_enable",
 		       CTLFLAG_RWTUN, &ctx->ifc_sysctl_qs_eq_override, 0,
                        "permit #txq != #rxq");
 	SYSCTL_ADD_INT(ctx_list, oid_list, OID_AUTO, "disable_msix",
-                      CTLFLAG_RWTUN, &ctx->ifc_softc_ctx.isc_disable_msix, 0,
-                      "disable MSI-X (default 0)");
+		       CTLFLAG_RWTUN, &ctx->ifc_softc_ctx.isc_disable_msix, 0,
+		       "disable MSI-X (default 0)");
 	SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "rx_budget",
 		       CTLFLAG_RWTUN, &ctx->ifc_sysctl_rx_budget, 0,
 		       "set the RX budget");
@@ -6798,8 +6800,8 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx)
 		       CTLFLAG_RDTUN, &ctx->ifc_sysctl_core_offset, 0,
 		       "offset to start using cores at");
 	SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "separate_txrx",
-		       CTLFLAG_RDTUN, &ctx->ifc_sysctl_separate_txrx, 0,
-		       "use separate cores for TX and RX");
+		      CTLFLAG_RDTUN, &ctx->ifc_sysctl_separate_txrx, 0,
+		      "use separate cores for TX and RX");
 	SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "use_logical_cores",
 		      CTLFLAG_RDTUN, &ctx->ifc_sysctl_use_logical_cores, 0,
 		      "try to make use of logical cores for TX and RX");
diff --git a/sys/net/iflib.h b/sys/net/iflib.h
index 21630297981f..a97d243c0bb0 100644
--- a/sys/net/iflib.h
+++ b/sys/net/iflib.h
@@ -453,11 +453,14 @@ int iflib_device_iov_add_vf(device_t, uint16_t, const nvlist_t *);
 int iflib_device_register(device_t dev, void *softc, if_shared_ctx_t sctx, if_ctx_t *ctxp);
 int iflib_device_deregister(if_ctx_t);
 
-int iflib_irq_alloc(if_ctx_t, if_irq_t, int, driver_filter_t, void *filter_arg, driver_intr_t, void *arg, const char *name);
+int iflib_irq_alloc(if_ctx_t, if_irq_t, int, driver_filter_t, void *filter_arg,
+		    driver_intr_t, void *arg, const char *name);
 int iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid,
 			    iflib_intr_type_t type, driver_filter_t *filter,
 			    void *filter_arg, int qid, const char *name);
-void iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type,  void *arg, int qid, const char *name);
+void iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq,
+				 iflib_intr_type_t type,  void *arg, int qid,
+				 const char *name);
 
 void iflib_irq_free(if_ctx_t ctx, if_irq_t irq);