Message ID | 20190221123908.7196-8-maximmi@mellanox.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="bpJYCdyo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 444vFp3j1Mz9s4Y for <patchwork-incoming-netdev@ozlabs.org>; Thu, 21 Feb 2019 23:40:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727897AbfBUMk3 (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Thu, 21 Feb 2019 07:40:29 -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 S1727887AbfBUMk2 (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 21 Feb 2019 07:40:28 -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=zXW/ciFot/Fgl8XKrMXhNEUWH8FEJGa632aPUSGWaR4=; b=bpJYCdyoWdpeq2TFpnV02+JWeoVqQ0eNqKTkV6lP2TVd76PGJjIZUnXNNghUN8GBljBAZvuhfZ0ZhrFAauE/W8T5pYz+CQS2qw2PBj+wjAVwWRowsW61EMs6qlA47ka5BoZ0w6Zjv+9L7+YvTQ5ozSFcqYoW+tD8IBLzI/cKbcE= 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:05 +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:05 +0000 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 7/7] net/mlx5e: Trust kernel regarding transport offset Thread-Topic: [PATCH net-next v2 7/7] net/mlx5e: Trust kernel regarding transport offset Thread-Index: AQHUyeKSSD8dXM7ApEa20+t+hCVWOQ== Date: Thu, 21 Feb 2019 12:40:05 +0000 Message-ID: <20190221123908.7196-8-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: 1419affd-8836-4fae-302b-08d697f9b48f 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=3BAM6PR05MB5816=3B23?= =?iso-8859-1?q?=3AmiNxgHxydlGIj0FWMPTBf3RdyGufEwPPIzTkmhFzJGj1MRYP?= =?iso-8859-1?q?gdR5cqaO12rU5wvh6hBRLgZZHwBT121PHFrVboxWmJwwn3/O80D?= =?iso-8859-1?q?LIzdVOHZoSAB9IUBsWHXPGNXaJwozzIzsXjs4qGzHUjo6HH2d/W?= =?iso-8859-1?q?pyrFk+wsPnUjd9iTdv/fxo1aXgFaoPFbdDRLpWEXy95ITHPpdUr?= =?iso-8859-1?q?sZxHB3JjaiZu2CcCy7wvg3Tj3+NvlJQg9YsPN8fw8HRzWvMZQWn?= =?iso-8859-1?q?KbH48cZsm7aPJtc/G21vQ4o4FutJ2zhqK5d2+ChXTUrjlMzZ9oz?= =?iso-8859-1?q?HF3Na3fu5hNZJP8cztPWO10HirxVvtMfE9lbo6WW+0sm/TCZprH?= =?iso-8859-1?q?24hQc2DTZ3TQQDagej9IPai0NHVtBWabpMryCH39KGODp9L8HsQ?= =?iso-8859-1?q?duDo+HkPeiKRHLEO9cGevXXKlzwXb7Q/g4Ov8YDp6t7lIV5n0sr?= =?iso-8859-1?q?dD17bJ1/iIWy5X2dclkjOpV39oGTPSzIP3vzF7DvAWku1d1euxd?= =?iso-8859-1?q?3KRZifzPQ73S0qCTamBJFSnSanwCQ3oMRdpYFFKJvxJigfnfL+p?= =?iso-8859-1?q?00juJj8KuxcG7QdqVo7xRBS2ZH3K0/IK4SjNBHeILnIeWr5pIfb?= =?iso-8859-1?q?tJYZz5J2KbWhYM3xUStyZ7LyMhOjPdrFBtR4qbpREXxpyPs/A4y?= =?iso-8859-1?q?1v50593jpHY+7OHr1r465wyNpaE3Pn0O1JmJpHznKghGmNFsegn?= =?iso-8859-1?q?k1hnihBXb5iG9Eav7/qdT3020/M4Kfljmlpg3+KIO3bC0UZI6Aj?= =?iso-8859-1?q?+zbjpYzlED2NxttMYV528vFHR8Rp2T4MiuLEPQrg02Twf4UdVsQ?= =?iso-8859-1?q?j6vaE5Thv1aT7AEmewK9C1MjtftMIdG9XKzuajiYm2Pvgp+vtKs?= =?iso-8859-1?q?uoKlVotGERXdjnm9feuxsHHOaTmvV6KoN9ORC7oDwGTgDMYx3jv?= =?iso-8859-1?q?T71istY/TtwZJofvsZZ9YSb0mNGxipO4uaD6PA7qs+TW0FbSONB?= =?iso-8859-1?q?0D0fsTACkTp5ztCBjzUZasnxz16rFCsq4BhhwLVbMXC7JNTUNy2?= =?iso-8859-1?q?RskTsKKO9ZDWdjaaD+E2g562AR3t/jzTyNWEygnkOOt6cZlw41s?= =?iso-8859-1?q?BUzy0N0qjSSrS5jhlCq3+KVXfc+dqrwlsUBkDhqW1cKj9EOJHi8?= =?iso-8859-1?q?MovXD76WUvzr9qWu4KMFbI4pdXpz730v8hAsCLVVoPZSOjVNFAS?= =?iso-8859-1?q?0zMQHS815x7Tc36+5dKOr/vptmtij9kw+Wvibi5+y17hy4obDgI?= =?iso-8859-1?q?n3Zad/oJSe2n7t3WgL09geBMlcpZuwc7BkZAyQ=3D?= x-microsoft-antispam-prvs: <AM6PR05MB581609F973B9FF0AC4643454D17E0@AM6PR05MB5816.eurprd05.prod.outlook.com> 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)(4744005)(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: oS1ZhYFvkbeFSLowpM1fVWdF+YhoiEJZpHRVXak8jfX7ntS87GHxOT+ceKUum3444iBg44WBVN5MvNXY+wY5OMiHSS4I8AA3Tiky1e1xWcsMO2me9Dxh2CsYxj0oOiOXBEI0T3PyEc1J57+8YMt1AGzaQqGWtz2pqpC8Su/l5TC98TeE/JQ5h6hLKJVwGN3A1YZG3dVIg9YzPEK0ou+JL5Ma4gp3oQVeI7Gf+9pZyEP5Xgv8iAtFjmxDg6R8aesWKoglr2jktyNcD9+L5RsjWBiZ+uxaHhQPlXmErwVvSZmXapRobFZB5nfB7gk9Knouyw+gjH9hMbGdfekWfX32xKSyzCCrvFdi6cqW4bagmzkpYeJKf2lisXvGlMOcYSNvkWjwG8NJPXbsPrEvTPuZFRzOjPsyh5jwvvgTcOCfWIs= 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: 1419affd-8836-4fae-302b-08d697f9b48f X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2019 12:40:04.2621 (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: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
AF_PACKET transport_offset fix
|
expand
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c index 6ca834702306..e7aae45a01f8 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c @@ -148,12 +148,8 @@ static inline int mlx5e_skb_l2_header_offset(struct sk_buff *skb) static inline int mlx5e_skb_l3_header_offset(struct sk_buff *skb) { - struct flow_keys keys; - if (skb_transport_header_was_set(skb)) return skb_transport_offset(skb); - else if (skb_flow_dissect_flow_keys(skb, &keys, 0)) - return keys.control.thoff; else return mlx5e_skb_l2_header_offset(skb); }