From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29FBFC43381 for ; Thu, 21 Feb 2019 12:40:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB1B02086A for ; Thu, 21 Feb 2019 12:40:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="OTBgNhZ6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727889AbfBUMkZ (ORCPT ); Thu, 21 Feb 2019 07:40:25 -0500 Received: from mail-eopbgr20078.outbound.protection.outlook.com ([40.107.2.78]:6395 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727732AbfBUMkZ (ORCPT ); Thu, 21 Feb 2019 07:40:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6RAnDGeGqp06hn78ASwvk0sgInxZs9ZrV3qE11ATGoo=; b=OTBgNhZ6h5TJCOwGm9NM88ZdBmEV3pXmw0zRQ5pt62DoRMFs1ONj9urzBSe3n4BizYjNshbnDPiYn32R56S9oHq7C3BawzIlSYMg+IwfoWg2vnTsTmWjCfAA2NTun1PEHWNnlX8NEh7Ace+v+X0/4U2RtYwRSBfIul1c8ufVENQ= Received: from AM6PR05MB5879.eurprd05.prod.outlook.com (20.179.0.76) by AM6PR05MB5816.eurprd05.prod.outlook.com (20.178.94.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1622.16; Thu, 21 Feb 2019 12:40:04 +0000 Received: from AM6PR05MB5879.eurprd05.prod.outlook.com ([fe80::98c7:b5be:ac6b:144]) by AM6PR05MB5879.eurprd05.prod.outlook.com ([fe80::98c7:b5be:ac6b:144%5]) with mapi id 15.20.1643.014; Thu, 21 Feb 2019 12:40:04 +0000 From: Maxim Mikityanskiy To: "David S. Miller" , Saeed Mahameed , Willem de Bruijn , Jason Wang , Eric Dumazet CC: "netdev@vger.kernel.org" , Eran Ben Elisha , Tariq Toukan , Maxim Mikityanskiy Subject: [PATCH net-next v2 6/7] net/mlx5e: Remove the wrong assumption about transport offset Thread-Topic: [PATCH net-next v2 6/7] net/mlx5e: Remove the wrong assumption about transport offset Thread-Index: AQHUyeKRknDOzyp3gUeBZfIaUNf97A== Date: Thu, 21 Feb 2019 12:40:04 +0000 Message-ID: <20190221123908.7196-7-maximmi@mellanox.com> References: <20190221123908.7196-1-maximmi@mellanox.com> In-Reply-To: <20190221123908.7196-1-maximmi@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LNXP265CA0070.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::34) To AM6PR05MB5879.eurprd05.prod.outlook.com (2603:10a6:20b:a2::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=maximmi@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.19.1 x-originating-ip: [141.226.120.58] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2b1d95a9-7b0e-4dfc-9024-08d697f9b3d8 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB5816; x-ms-traffictypediagnostic: AM6PR05MB5816: x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1;AM6PR05MB5816;23:k6NRBqBUuWGNGG4VIL2bz3F7zhPraxkR3Gw5H1l?= =?iso-8859-1?Q?H0nWtPCkdm/EhV/asu8+iRjlp2PJ8f73vyEqnIMb0QEMUX0O5t7WtOSVxR?= =?iso-8859-1?Q?bCnH2WndktD6CES/YtIfraofvXCGIK4k8BS3r5PqUX0QMQqNI4Yt8Y69IO?= =?iso-8859-1?Q?PoYReZ7thh9adpFCIdHFHhON/5XJ/I/QabKzl3aB4jze5SpvLNNHcPLgVg?= =?iso-8859-1?Q?ym5RYNz9SlOyRja/pnGGsIMEGM4nj3XAviPC5EwgHqMdo4g+SYgYHr3TwB?= =?iso-8859-1?Q?v3T5Mp5Zx9+hH7+0biAVoiZ2HPaPrrG+KVsAYibq9cbmcLLllGhSg5fTzC?= =?iso-8859-1?Q?/TnTykjwyCFuGKfYxbVtjbSE8mAYXMZl3+PK1xWP4777flguF5jIn8S7wY?= =?iso-8859-1?Q?Z6ZOoS7fSguAXIgTljMCAp9TCgW9xX+q7gmT04XQ3VrNh31qVAwl6pIyze?= =?iso-8859-1?Q?PhqKTy30hFkpczGeVarK8IXp5gIRdqEhJGhKqozSE0Kn+Ge8b01glWUlEn?= =?iso-8859-1?Q?rJ4Q4JjmJF9OBaXCSgaCWlg9F1uI4hj/WfALfW9h1AHCtbkzwu/aPB6GPQ?= =?iso-8859-1?Q?EAdg/uYrmHkQSqLHOHqaQtQqpoBwWrcT+Pl3M/kcdOqIfnT5lNnT87cGQx?= =?iso-8859-1?Q?YNurXu6qgRWYpWDWy2r0k1Ys3lvsH3x+Bd8imzhQh7MFsx3BqVY59o0aNr?= =?iso-8859-1?Q?GF1DTGYBDPw8B997DSMWfX0PRYF/PBbkMaMW5rDFIluzcJajCBsB50wdZo?= =?iso-8859-1?Q?rKV114Z9AVJieB0GXtE0SvRe/FGQ5IMQ54vBXyk9qE44psvybJqDErG7+r?= =?iso-8859-1?Q?INE+LrTK7mXGTTy3TXg+tJ9WqEwXMlmTT4mYrdbD2RC0wQtHDFon0iW8va?= =?iso-8859-1?Q?yuLVRYJ46lcocG5LVWM9sceAHoQ0iQzBqxow9u+FvKByVknU2nMaJTZO21?= =?iso-8859-1?Q?wxq92MitA9rq+ZzdyElPl2CicPTR1295ttvTYs28f2uccLXzQHgKpT4qjS?= =?iso-8859-1?Q?YJ9VXiGc6cLKsQVxcuOdOYDgP1LJ/nQeewL9bJ2sIoh4fiHZX01nHMb9DP?= =?iso-8859-1?Q?nYP7bAW8WKaLSVXV5R/tHFbCvX7CVEYXl9T/gZDDCeix31dM2zHSx8iq+w?= =?iso-8859-1?Q?Bo5bOegmyJLq6nquAuIds4MX5uArMhllxN2OdbWZBhKfzPLIOz/KuGuPB6?= =?iso-8859-1?Q?cyH7CSCc3CyRUUcg+JVbObI0kl4P7a8TQuiKjUkZmvV3RA+ffVE4o9cl3y?= =?iso-8859-1?Q?c0fgEneyD9vDcu6NARrMuh/T7CAGNjDCZI4j7CQ=3D=3D?= x-microsoft-antispam-prvs: x-forefront-prvs: 09555FB1AD x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(136003)(39860400002)(366004)(376002)(396003)(346002)(189003)(199004)(6512007)(316002)(1076003)(54906003)(305945005)(25786009)(478600001)(7736002)(66066001)(81166006)(99286004)(53936002)(110136005)(68736007)(8676002)(8936002)(76176011)(71200400001)(71190400001)(6436002)(52116002)(5660300002)(81156014)(50226002)(6486002)(4326008)(256004)(107886003)(86362001)(102836004)(26005)(476003)(186003)(11346002)(2906002)(3846002)(6116002)(105586002)(386003)(36756003)(6506007)(446003)(97736004)(14454004)(486006)(2616005)(106356001);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB5816;H:AM6PR05MB5879.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: hA/9w+01PyiOHbqJ7qPDsJMwrOl89RbjZ+YYDtF5CW4/xE+lWATb3TXHz9sBe9SdRHhDh2BZfMe3TI4U6GwVJI4X22aNNgGtZAH6oZH0Kwo6UeIfcDNKWG78Tna9FFBaPqS516SDqYEWa6ITkoOOaEdHRdyJeIAILyAwSNWk7iLx8ecuehMYsl9vyUn0k7Ogjh63D/56iQPfYWuRSKlFxMRJLTEqdWp2ncKZHnI0YaiMblNJqesizwJKuNJrQ/+UZSBUVb7PKwSIEiGYu2nyrVVykkuYtUv6mq8wEPl0FTboR3wwLYuV/CnnLCD6BLwJxdkYgP+CCKWiYjSBvT2+cQFzIfHtRyJcZ5NxdosC1n8VkByDZ0FKkaNvlqpLCpeT6kJ8w0lu5M7UEcflWlBMx+jZXMiO+nPgWstsg7efXJk= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b1d95a9-7b0e-4dfc-9024-08d697f9b3d8 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2019 12:40:02.5449 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5816 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb_transport_offset() =3D=3D 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 Reviewed-by: Saeed Mahameed --- 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_inli= ne_modes mode, hlen +=3D 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 =3D mlx5e_skb_l3_header_offset(skb); - break; - } - /* fall through */ + hlen =3D mlx5e_skb_l3_header_offset(skb); + break; case MLX5_INLINE_MODE_L2: default: hlen =3D mlx5e_skb_l2_header_offset(skb); --=20 2.19.1