From: Maxim Mikityanskiy <maximmi@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>,
Saeed Mahameed <saeedm@mellanox.com>,
Willem de Bruijn <willemb@google.com>,
Jason Wang <jasowang@redhat.com>,
Eric Dumazet <edumazet@google.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Eran Ben Elisha <eranbe@mellanox.com>,
Tariq Toukan <tariqt@mellanox.com>,
Maxim Mikityanskiy <maximmi@mellanox.com>
Subject: [PATCH net-next v2 6/7] net/mlx5e: Remove the wrong assumption about transport offset
Date: Thu, 21 Feb 2019 12:40:04 +0000 [thread overview]
Message-ID: <20190221123908.7196-7-maximmi@mellanox.com> (raw)
In-Reply-To: <20190221123908.7196-1-maximmi@mellanox.com>
skb_transport_offset() == 0 is not a special value. The only special
value is when skb->transport_header is ~0U, and it's checked by
skb_transport_header_was_set().
Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index c1334a8ac8f3..6ca834702306 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -172,15 +172,8 @@ static inline u16 mlx5e_calc_min_inline(enum mlx5_inline_modes mode,
hlen += VLAN_HLEN;
break;
case MLX5_INLINE_MODE_IP:
- /* When transport header is set to zero, it means no transport
- * header. When transport header is set to 0xff's, it means
- * transport header wasn't set.
- */
- if (skb_transport_offset(skb)) {
- hlen = mlx5e_skb_l3_header_offset(skb);
- break;
- }
- /* fall through */
+ hlen = mlx5e_skb_l3_header_offset(skb);
+ break;
case MLX5_INLINE_MODE_L2:
default:
hlen = mlx5e_skb_l2_header_offset(skb);
--
2.19.1
next prev parent reply other threads:[~2019-02-21 12:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-21 12:39 [PATCH net-next v2 0/7] AF_PACKET transport_offset fix Maxim Mikityanskiy
2019-02-21 12:39 ` [PATCH net-next v2 1/7] net: Don't set transport offset to invalid value Maxim Mikityanskiy
2019-02-21 17:28 ` Willem de Bruijn
2019-02-22 12:30 ` Maxim Mikityanskiy
2019-02-22 14:16 ` Willem de Bruijn
2019-02-21 12:39 ` [PATCH net-next v2 2/7] net: Introduce parse_protocol header_ops callback Maxim Mikityanskiy
2019-02-21 12:39 ` [PATCH net-next v2 3/7] net/ethernet: Add parse_protocol header_ops support Maxim Mikityanskiy
2019-02-21 12:40 ` [PATCH net-next v2 4/7] net/packet: Ask driver for protocol if not provided by user Maxim Mikityanskiy
2019-02-21 12:40 ` [PATCH net-next v2 5/7] net/packet: Remove redundant skb->protocol set Maxim Mikityanskiy
2019-02-21 12:40 ` Maxim Mikityanskiy [this message]
2019-02-21 12:40 ` [PATCH net-next v2 7/7] net/mlx5e: Trust kernel regarding transport offset Maxim Mikityanskiy
2019-02-22 12:55 ` [PATCH net-next] net: Skip GSO length estimation if transport header is not set Maxim Mikityanskiy
2019-02-22 14:19 ` Willem de Bruijn
2019-02-24 20:41 ` David Miller
2019-02-22 14:20 ` [PATCH net-next v2 0/7] AF_PACKET transport_offset fix Willem de Bruijn
2019-02-22 20:55 ` 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=20190221123908.7196-7-maximmi@mellanox.com \
--to=maximmi@mellanox.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=eranbe@mellanox.com \
--cc=jasowang@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
--cc=tariqt@mellanox.com \
--cc=willemb@google.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).