All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jakub Kicinski <jakub.kicinski@netronome.com>
To: netdev@vger.kernel.org
Cc: oss-drivers@netronome.com, Edwin Peer <edwin.peer@netronome.com>
Subject: [PATCH net-next 2/9] nfp: rename l4_offset in struct nfp_net_tx_desc to lso_hdrlen
Date: Mon, 15 May 2017 17:55:16 -0700	[thread overview]
Message-ID: <20170516005523.26124-3-jakub.kicinski@netronome.com> (raw)
In-Reply-To: <20170516005523.26124-1-jakub.kicinski@netronome.com>

From: Edwin Peer <edwin.peer@netronome.com>

The l4_offset field referred to by NFD is confusingly named. It is not the
offset of the L4 transport header, but rather the L4 payload.

The LSO2 capability supported by alternative device firmware requires
the actual L4 offset, thus the rename seems prudent.

Signed-off-by: Edwin Peer <edwin.peer@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
---
 drivers/net/ethernet/netronome/nfp/nfp_net.h        | 2 +-
 drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h
index fcf81b3be830..6bad11e5b845 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h
@@ -153,7 +153,7 @@ struct nfp_net_tx_desc {
 			__le32 dma_addr_lo; /* Low 32bit of host buf addr */
 
 			__le16 mss;	/* MSS to be used for LSO */
-			u8 l4_offset;	/* LSO, where the L4 data starts */
+			u8 lso_hdrlen;	/* LSO, TCP payload offset */
 			u8 flags;	/* TX Flags, see @PCIE_DESC_TX_* */
 
 			__le16 vlan;	/* VLAN tag to add if indicated */
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 76251a09a1f3..0cebe9098451 100644
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -677,7 +677,7 @@ static void nfp_net_tx_tso(struct nfp_net_r_vector *r_vec,
 	txbuf->real_len += hdrlen * (txbuf->pkt_cnt - 1);
 
 	mss = skb_shinfo(skb)->gso_size & PCIE_DESC_TX_MSS_MASK;
-	txd->l4_offset = hdrlen;
+	txd->lso_hdrlen = hdrlen;
 	txd->mss = cpu_to_le16(mss);
 	txd->flags |= PCIE_DESC_TX_LSO;
 
@@ -823,7 +823,7 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev)
 
 	txd->flags = 0;
 	txd->mss = 0;
-	txd->l4_offset = 0;
+	txd->lso_hdrlen = 0;
 
 	nfp_net_tx_tso(r_vec, txbuf, txd, skb);
 
@@ -1515,7 +1515,7 @@ nfp_net_tx_xdp_buf(struct nfp_net_dp *dp, struct nfp_net_rx_ring *rx_ring,
 
 	txd->flags = 0;
 	txd->mss = 0;
-	txd->l4_offset = 0;
+	txd->lso_hdrlen = 0;
 
 	tx_ring->wr_p++;
 	tx_ring->wr_ptr_add++;
-- 
2.11.0

  parent reply	other threads:[~2017-05-16  0:56 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-16  0:55 [PATCH net-next 0/9] nfp: LSO, checksum and XDP datapath updates Jakub Kicinski
2017-05-16  0:55 ` [PATCH net-next 1/9] nfp: don't enable TSO on the device when disabled Jakub Kicinski
2017-05-16  0:55 ` Jakub Kicinski [this message]
2017-05-16  0:55 ` [PATCH net-next 3/9] nfp: support LSO2 capability Jakub Kicinski
2017-05-16  6:56   ` [oss-drivers] " Simon Horman
2017-05-16  0:55 ` [PATCH net-next 4/9] nfp: don't assume RSS and IRQ moderation are always enabled Jakub Kicinski
2017-05-16  0:55 ` [PATCH net-next 5/9] nfp: version independent support for chained RSS metadata Jakub Kicinski
2017-05-16  0:55 ` [PATCH net-next 6/9] nfp: add CHECKSUM_COMPLETE support Jakub Kicinski
2017-05-16  0:55 ` [PATCH net-next 7/9] nfp: complete the XDP TX ring only when it's full Jakub Kicinski
2017-05-16  0:55 ` [PATCH net-next 8/9] nfp: add a helper for wrapping descriptor index Jakub Kicinski
2017-05-16  7:08   ` [oss-drivers] " Simon Horman
2017-05-16  7:38     ` Jakub Kicinski
2017-05-16  8:22       ` Simon Horman
2017-05-16  0:55 ` [PATCH net-next 9/9] nfp: eliminate an if statement in calculation of completed frames Jakub Kicinski
2017-05-16  6:57   ` [oss-drivers] " Simon Horman
2017-05-17 11:07   ` David Laight
2017-05-17 17:36     ` Jakub Kicinski
2017-05-19  9:18       ` David Laight
2017-05-16 16:59 ` [PATCH net-next 0/9] nfp: LSO, checksum and XDP datapath updates David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170516005523.26124-3-jakub.kicinski@netronome.com \
    --to=jakub.kicinski@netronome.com \
    --cc=edwin.peer@netronome.com \
    --cc=netdev@vger.kernel.org \
    --cc=oss-drivers@netronome.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.