svn commit: r365124 - head/sys/dev/bnxt
Mateusz Guzik
mjg at FreeBSD.org
Tue Sep 1 21:43:25 UTC 2020
Author: mjg
Date: Tue Sep 1 21:43:23 2020
New Revision: 365124
URL: https://svnweb.freebsd.org/changeset/base/365124
Log:
bnxt: clean up empty lines in .c and .h files
Modified:
head/sys/dev/bnxt/bnxt.h
head/sys/dev/bnxt/bnxt_hwrm.c
head/sys/dev/bnxt/bnxt_sysctl.c
head/sys/dev/bnxt/if_bnxt.c
Modified: head/sys/dev/bnxt/bnxt.h
==============================================================================
--- head/sys/dev/bnxt/bnxt.h Tue Sep 1 21:43:05 2020 (r365123)
+++ head/sys/dev/bnxt/bnxt.h Tue Sep 1 21:43:23 2020 (r365124)
@@ -413,7 +413,6 @@ struct bnxt_vf_info {
bus_addr_t hwrm_cmd_req_dma_addr;
};
-
#define BNXT_PF(softc) (!((softc)->flags & BNXT_FLAG_VF))
#define BNXT_VF(softc) ((softc)->flags & BNXT_FLAG_VF)
Modified: head/sys/dev/bnxt/bnxt_hwrm.c
==============================================================================
--- head/sys/dev/bnxt/bnxt_hwrm.c Tue Sep 1 21:43:05 2020 (r365123)
+++ head/sys/dev/bnxt/bnxt_hwrm.c Tue Sep 1 21:43:23 2020 (r365124)
@@ -263,7 +263,6 @@ qportcfg_exit:
return (rc);
}
-
int
bnxt_hwrm_ver_get(struct bnxt_softc *softc)
{
@@ -377,7 +376,6 @@ bnxt_hwrm_func_drv_rgtr(struct bnxt_softc *softc)
return hwrm_send_message(softc, &req, sizeof(req));
}
-
int
bnxt_hwrm_func_drv_unrgtr(struct bnxt_softc *softc, bool shutdown)
{
@@ -390,7 +388,6 @@ bnxt_hwrm_func_drv_unrgtr(struct bnxt_softc *softc, bo
return hwrm_send_message(softc, &req, sizeof(req));
}
-
static inline int
_is_valid_ether_addr(uint8_t *addr)
{
@@ -529,7 +526,6 @@ bnxt_hwrm_set_link_common(struct bnxt_softc *softc,
req->flags |= htole32(HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESET_PHY);
}
-
static void
bnxt_hwrm_set_pause_common(struct bnxt_softc *softc,
struct hwrm_port_phy_cfg_input *req)
@@ -559,7 +555,6 @@ bnxt_hwrm_set_pause_common(struct bnxt_softc *softc,
}
}
-
/* JFV this needs interface connection */
static void
bnxt_hwrm_set_eee(struct bnxt_softc *softc, struct hwrm_port_phy_cfg_input *req)
@@ -586,7 +581,6 @@ bnxt_hwrm_set_eee(struct bnxt_softc *softc, struct hwr
}
}
-
int
bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, bool set_pause,
bool set_eee, bool set_link)
@@ -598,7 +592,7 @@ bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, b
return ENOTSUP;
bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_PORT_PHY_CFG);
-
+
if (set_pause) {
bnxt_hwrm_set_pause_common(softc, &req);
@@ -608,10 +602,10 @@ bnxt_hwrm_set_link_setting(struct bnxt_softc *softc, b
if (set_link)
bnxt_hwrm_set_link_common(softc, &req);
-
+
if (set_eee)
bnxt_hwrm_set_eee(softc, &req);
-
+
BNXT_HWRM_LOCK(softc);
rc = _hwrm_send_message(softc, &req, sizeof(req));
@@ -905,7 +899,6 @@ bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt_softc *softc,
return hwrm_send_message(softc, &req, sizeof(req));
}
-
int
bnxt_hwrm_set_filter(struct bnxt_softc *softc, struct bnxt_vnic_info *vnic)
{
@@ -966,7 +959,7 @@ int
bnxt_cfg_async_cr(struct bnxt_softc *softc)
{
int rc = 0;
-
+
if (BNXT_PF(softc)) {
struct hwrm_func_cfg_input req = {0};
@@ -1569,7 +1562,7 @@ bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc)
* 3. When the auto_mode is set to none and this flag is set to 1,
* auto_pause bits should be ignored and should be set to 0.
*/
-
+
link_info->flow_ctrl.autoneg = false;
link_info->flow_ctrl.tx = false;
link_info->flow_ctrl.rx = false;
@@ -1697,7 +1690,6 @@ static void bnxt_hwrm_set_coal_params(struct bnxt_soft
req->num_cmpl_aggr_int = htole16((uint16_t)max_frames * 4);
}
-
int bnxt_hwrm_set_coal(struct bnxt_softc *softc)
{
int i, rc = 0;
@@ -1749,7 +1741,6 @@ int bnxt_hwrm_set_coal(struct bnxt_softc *softc)
buf_tmr_irq << 16 | buf_tmr, flags, &req_tx);
for (i = 0; i < softc->nrxqsets; i++) {
-
req = &req_rx;
/*
@@ -1767,8 +1758,6 @@ int bnxt_hwrm_set_coal(struct bnxt_softc *softc)
}
return rc;
}
-
-
int bnxt_hwrm_func_rgtr_async_events(struct bnxt_softc *softc, unsigned long *bmap,
int bmap_size)
Modified: head/sys/dev/bnxt/bnxt_sysctl.c
==============================================================================
--- head/sys/dev/bnxt/bnxt_sysctl.c Tue Sep 1 21:43:05 2020 (r365123)
+++ head/sys/dev/bnxt/bnxt_sysctl.c Tue Sep 1 21:43:23 2020 (r365124)
@@ -173,7 +173,6 @@ bnxt_create_tx_sysctls(struct bnxt_softc *softc, int t
if (!oid)
return ENOMEM;
-
SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO,
"ucast_pkts", CTLFLAG_RD, &tx_stats[txr].tx_ucast_pkts,
"unicast packets sent");
@@ -651,7 +650,6 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *soft
return 0;
}
-
int
bnxt_create_rx_sysctls(struct bnxt_softc *softc, int rxr)
{
@@ -1362,7 +1360,7 @@ bnxt_create_hw_lro_sysctls(struct bnxt_softc *softc)
softc, 0, bnxt_hw_lro_set_max_agg_segs, "A",
"Set Max Agg Seg Value (unit is Log2): "
"0 (= 1 seg) / 1 (= 2 segs) / ... / 31 (= 2^31 segs)");
-
+
SYSCTL_ADD_PROC(&softc->hw_lro_ctx, SYSCTL_CHILDREN(oid), OID_AUTO,
"max_aggs", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT,
softc, 0, bnxt_hw_lro_set_max_aggs, "A",
Modified: head/sys/dev/bnxt/if_bnxt.c
==============================================================================
--- head/sys/dev/bnxt/if_bnxt.c Tue Sep 1 21:43:05 2020 (r365123)
+++ head/sys/dev/bnxt/if_bnxt.c Tue Sep 1 21:43:23 2020 (r365124)
@@ -713,7 +713,6 @@ bnxt_attach_pre(if_ctx_t ctx)
if (rc)
goto dma_fail;
-
/* Get firmware version and compare with driver */
softc->ver_info = malloc(sizeof(struct bnxt_ver_info),
M_DEVBUF, M_NOWAIT | M_ZERO);
@@ -1094,7 +1093,6 @@ bnxt_init(if_ctx_t ctx)
rc = bnxt_hwrm_ring_grp_alloc(softc, &softc->grp_info[i]);
if (rc)
goto fail;
-
}
/* Allocate the VNIC RSS context */
@@ -1250,7 +1248,6 @@ bnxt_media_status(if_ctx_t ctx, struct ifmediareq * if
uint64_t target_baudrate = bnxt_get_baudrate(link_info);
int active_media = IFM_UNKNOWN;
-
bnxt_update_link(softc, true);
ifmr->ifm_status = IFM_AVALID;
@@ -1655,7 +1652,6 @@ bnxt_priv_ioctl(if_ctx_t ctx, u_long command, caddr_t
int rc = ENOTSUP;
struct bnxt_ioctl_data iod_storage, *iod = &iod_storage;
-
switch (command) {
case SIOCGPRIVATE_0:
if ((rc = priv_check(curthread, PRIV_DRIVER)) != 0)
@@ -2086,7 +2082,7 @@ bnxt_add_media_types(struct bnxt_softc *softc)
BNXT_IFMEDIA_ADD(supported, SPEEDS_100MB, IFM_100_T);
BNXT_IFMEDIA_ADD(supported, SPEEDS_10MB, IFM_10_T);
break;
-
+
case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX:
BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR);
BNXT_IFMEDIA_ADD(supported, SPEEDS_2_5GB, IFM_2500_KX);
More information about the svn-src-all
mailing list