The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=91ca7b0954088f882e55e0ece6f456ca172ebcf5
commit 91ca7b0954088f882e55e0ece6f456ca172ebcf5
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2021-05-14 19:16:57 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2021-05-14 19:16:57 +0000
cxgbei: Whitespace fixes, comment typo, and rewrap a comment.
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D29906
---
sys/dev/cxgbe/cxgbei/cxgbei.c | 2 +-
sys/dev/cxgbe/cxgbei/icl_cxgbei.c | 12 ++++++------
sys/dev/cxgbe/tom/t4_cpl_io.c | 9 ++++-----
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/sys/dev/cxgbe/cxgbei/cxgbei.c b/sys/dev/cxgbe/cxgbei/cxgbei.c
index 7027e6428515..419293ec9cdf 100644
--- a/sys/dev/cxgbe/cxgbei/cxgbei.c
+++ b/sys/dev/cxgbe/cxgbei/cxgbei.c
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
#include "common/common.h"
#include "common/t4_msg.h"
-#include "common/t4_regs.h" /* for PCIE_MEM_ACCESS */
+#include "common/t4_regs.h" /* for PCIE_MEM_ACCESS */
#include "tom/t4_tom.h"
#include "cxgbei.h"
diff --git a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
index 9ee31616b873..655cc1de1478 100644
--- a/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
+++ b/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
@@ -280,7 +280,7 @@ finalize_pdu(struct icl_cxgbei_conn *icc, struct
icl_cxgbei_pdu *icp)
last = m_last(m);
/*
- * Round up the data segment to a 4B boundary. Pad with 0 if
+ * Round up the data segment to a 4B boundary. Pad with 0 if
* necessary. There will definitely be room in the mbuf.
*/
padding = roundup2(ip->ip_data_len, 4) - ip->ip_data_len;
@@ -306,7 +306,7 @@ finalize_pdu(struct icl_cxgbei_conn *icc, struct
icl_cxgbei_pdu *icp)
bhs->bhs_data_segment_len[1] = ip->ip_data_len >> 8;
bhs->bhs_data_segment_len[0] = ip->ip_data_len >> 16;
- /* "Convert" PDU to mbuf chain. Do not use icp/ip after this. */
+ /* "Convert" PDU to mbuf chain. Do not use icp/ip after this. */
m->m_pkthdr.len = sizeof(struct iscsi_bhs) + ip->ip_data_len + padding;
m->m_next = ip->ip_data_mbuf;
set_mbuf_ulp_submode(m, ulp_submode);
@@ -347,7 +347,7 @@ icl_cxgbei_conn_pdu_append_data(struct icl_conn *ic, struct
icl_pdu *ip,
MPASS(ip->ip_data_len <= ic->ic_max_data_segment_length);
return (0);
} else {
- if (flags & M_WAITOK) {
+ if (flags & M_WAITOK) {
CXGBE_UNIMPLEMENTED("fail safe append");
}
ip->ip_data_len = m_length(m, NULL);
@@ -576,7 +576,7 @@ send_iscsi_flowc_wr(struct adapter *sc, struct toepcb
*toep, int maxlen)
toep->txsd_pidx = 0;
toep->txsd_avail--;
- t4_wrq_tx(sc, wr);
+ t4_wrq_tx(sc, wr);
}
static void
@@ -813,7 +813,7 @@ icl_cxgbei_conn_task_setup(struct icl_conn *ic, struct
icl_pdu *ip,
csio->dxfer_len < ci->ddp_threshold) {
no_ddp:
/*
- * No DDP for this I/O. Allocate an ITT (based on the one
+ * No DDP for this I/O. Allocate an ITT (based on the one
* passed in) that cannot be a valid hardware DDP tag in the
* iSCSI region.
*/
@@ -1049,7 +1049,7 @@ static int
icl_cxgbei_limits(struct icl_drv_limits *idl)
{
- /* Maximum allowed by the RFC. cxgbei_limits will clip them. */
+ /* Maximum allowed by the RFC. cxgbei_limits will clip them. */
idl->idl_max_recv_data_segment_length = (1 << 24) - 1;
idl->idl_max_send_data_segment_length = (1 << 24) - 1;
diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
index b4d84d3e5c55..d1b20cfa0e1e 100644
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -1819,13 +1819,12 @@ do_fw4_ack(struct sge_iq *iq, const struct rss_header
*rss, struct mbuf *m)
SOCKBUF_LOCK(sb);
sbu = sbused(sb);
if (ulp_mode(toep) == ULP_MODE_ISCSI) {
-
if (__predict_false(sbu > 0)) {
/*
- * The data trasmitted before the tid's ULP mode
- * changed to ISCSI is still in so_snd.
- * Incoming credits should account for so_snd
- * first.
+ * The data transmitted before the
+ * tid's ULP mode changed to ISCSI is
+ * still in so_snd. Incoming credits
+ * should account for so_snd first.
*/
sbdrop_locked(sb, min(sbu, plen));
plen -= min(sbu, plen);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
