Message ID | 1507020902-4952-6-git-send-email-Michal.Kalderon@cavium.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show
Return-Path: <linux-rdma-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 279366029B for <patchwork-linux-rdma@patchwork.kernel.org>; Tue, 3 Oct 2017 08:56:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A3761FFCA for <patchwork-linux-rdma@patchwork.kernel.org>; Tue, 3 Oct 2017 08:56:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F11B28773; Tue, 3 Oct 2017 08:56:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98CAA1FFCA for <patchwork-linux-rdma@patchwork.kernel.org>; Tue, 3 Oct 2017 08:56:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339AbdJCI4B (ORCPT <rfc822;patchwork-linux-rdma@patchwork.kernel.org>); Tue, 3 Oct 2017 04:56:01 -0400 Received: from mail-bl2nam02on0083.outbound.protection.outlook.com ([104.47.38.83]:22208 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751277AbdJCIz4 (ORCPT <rfc822;linux-rdma@vger.kernel.org>); Tue, 3 Oct 2017 04:55:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dM29YuvjRhuKiMqoIFU2ik4DQNZHhhMD6qhgYtoZsFY=; b=Bbh8uuEzQbdl70nUw6jyfKTxXjDbhUKAroxFYRLEb67+0EhTz7tH2LYB+LaylyaodJm1N4Hch1SwA4Vclq+rFLgUMAWYxVqm2c5xxgMRA4LiZb53G9TWfNvHa+IXOSX1xsJJrAj6zY3w6rHS1d0BQcQ25uGOXICFDW3/+liN7U4= Received: from CY1PR07CA0021.namprd07.prod.outlook.com (10.166.202.31) by BLUPR07MB884.namprd07.prod.outlook.com (10.242.191.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 3 Oct 2017 08:55:54 +0000 Received: from BY2FFO11OLC005.protection.gbl (2a01:111:f400:7c0c::124) by CY1PR07CA0021.outlook.office365.com (2a01:111:e400:c60a::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.8 via Frontend Transport; Tue, 3 Oct 2017 08:55:53 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BY2FFO11OLC005.mail.protection.outlook.com (10.1.14.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.77.10 via Frontend Transport; Tue, 3 Oct 2017 08:55:53 +0000 Received: from lb-tlvb-michal.il.qlogic.com.com (10.185.6.89) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Tue, 3 Oct 2017 01:55:50 -0700 From: Michal Kalderon <Michal.Kalderon@cavium.com> To: <davem@davemloft.net> CC: <netdev@vger.kernel.org>, <linux-rdma@vger.kernel.org>, <dledford@redhat.com>, Michal Kalderon <Michal.Kalderon@cavium.com>, "Ariel Elior" <Ariel.Elior@cavium.com> Subject: [PATCH v2 net-next 05/12] qed: Add the source of a packet sent on an iWARP ll2 connection Date: Tue, 3 Oct 2017 11:54:55 +0300 Message-ID: <1507020902-4952-6-git-send-email-Michal.Kalderon@cavium.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1507020902-4952-1-git-send-email-Michal.Kalderon@cavium.com> References: <1507020902-4952-1-git-send-email-Michal.Kalderon@cavium.com> MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(2980300002)(428002)(189002)(199003)(50226002)(81156014)(81166006)(189998001)(2351001)(8676002)(356003)(8936002)(104016004)(36756003)(5660300001)(2950100002)(47776003)(72206003)(305945005)(316002)(54906003)(16586007)(478600001)(6916009)(107886003)(2906002)(5003940100001)(76176999)(50986999)(86362001)(4326008)(101416001)(50466002)(48376002)(77096006)(105586002)(69596002)(106466001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR07MB884; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC005; 1:iqOObtfZU2U9Xnhc7KarqSeuuo8T+y2hKesD35qODiIwFHLs8FR67qEC2JfRjY+Q/VVa7rt0SubYbhdrLmfNoS7iJKA0QJOMKnCgPybJ0NN6Ks+EfUy6Hu5A4PdNAUZV X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa5fa9b1-3ad8-4d0a-dcdf-08d50a3c8dc5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR07MB884; X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB884; 3:K44SZ7rfex2TpyTSn5YMGlcAxy5yldcNhwJ+eqwQjpLLY1E2LAzuAR/LDEmtgIpi77ySoVB+UlORSZgYwyZkPj9c0pNl8XQiIYl44phjnPh/I0uDHT/Z1zNzEIPTbWXLG6n71Wk4UzULqc3Q/2kuHyjzNFrVC+KihiMPjctWCJOAM7Nv+OUvMBCCan50ROZfZoc/i4ADiqgXMYW5ygXFT5U1iOB9X42pZ3b08lugrqe2i+JvvGvadQ55A1ezX47AARYC5H+icY8wLq1+WiayOnEqlVaRkKcs3O7Y3q3lsNKNHXub4MzDtYM86+0X5ZHHIgcYVBa2lRqcrBCA6k19WQ==; 25:J5qXAkL59HSnlZR36xM0eVyfO7nb+P7+1RyAQ20zbrK+ocMGHecvIn/sk6G8N+5XCxL+Xbm/0Ng+rlksNZFOm3obBH3ZqsHmSxO2aZ7ulHOvKuqERizf1BcyLFxsijkgKXqMQPUT57DVROswKnKnOitAlcknHUqwMnYQqQo3HMOjkiqOu/Z+MnQrD17exXHi65kbcScpmHe6fDNTdeZKF03EAR9WUVD08yoP+2oVxeQfCLNyXdnmWcq+HDaHjFrE9liyqb2K5nXLLYDmFD7XdyixREpY/S8w3EfJpexh50JMQlJlunrmnpOJyCCPeaN0AB6ihpskoC7OxVMjsjDHkQ==; 31:dIjbbnPMgfyZP0gUwCXGhqdRvLF9Mi3WEH39byJxNdWS8/GO2WY0Eb6RK1ZcdgYBpCd/xzXTCESrhcmZxuCegFu/b5S3z08KwC0BRqUftkq8t57QQhu/oUDFKKHQIxayXRS8MHF8N8aMIbGjftJ+ahY6UknY4gyhkxC71ZGOAxKex+w4DvAMWE7yAaKIz+MbBSBvEOJPKNEckh53K57214ztFdKUcgybSDq5gVXg8oo= X-MS-TrafficTypeDiagnostic: BLUPR07MB884: X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB884; 20:UiEUqdUx9JDcjogbLwTfundFd/FJFrI2+HfWj7zNmp+dYn/OY+puQ+OopOFMxU7uyaCOQUy3ZAwB6/+ZrzhB7NUz78vJnyrOdeK5s/qKbuDbmDyFQG8hABYG4f6/6VFQMZ/OpA0F1Ylbl1Dj0q2E8pggJ9tvNHCWeLpAMAt4yFgNrm4A/CY76wMmUu0MfJYUAnuNDjyp8f8tM/5pZ8j45WJO0kpq0iEq9P0jXLbqn8cfzYCgg+/b1jSHR3MSrqTnWYdJkTLYEbudQf+EGJwpgsmDNiKWDFXnYxtSsxG9zsbLMdVVemPKFArbLD7iKPUZJx9smXj025CDid9q8SHppdv2+wtLt+RX8eLfxKkKO8o0sUWPoWke0lVbbsc5LByI8lvlWS7gGNdoST9CsNaDoNkH4SRHL88H+zrodxTn0kl2bTpHgeO2dg2/va58xAMkvdPjKrZdLM4FBvEfxics/onko5sFp8XYJg69eGKy+zIEkPPZf1eYWDvvQS2GeO1n; 4:cDOlRJ7y3bZ/zirolF/+AL3rkRsyomVI68e92/ttlIFIOtp7LYg0vL7un750CtVujY/nvlk7QR6ucmPPGvr2awL8Mj1mFoypegr4OP7tHnYmf1S4yECB3P2vggTx4DgU/SYTDrp3rkSrnHBU5NDsqbYTN7U08AALvCB+Lde51KtaT8jVDqpmFZmQI6dn+uXAkUhvt4IVy2wx0FxAPicah3L67y+GKIj0LP2toWnBbN1thc/kL1y+lo7Lj1+ArbY/wD8AP+hT0vK1r4XaHYdzGpp7wCi3joZ0G1N7HmJfLzY= X-Exchange-Antispam-Report-Test: UriScan:(17755550239193); X-Microsoft-Antispam-PRVS: <BLUPR07MB88400618FB5E92EC4C0355E88720@BLUPR07MB884.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123560025)(20161123558100)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR07MB884; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR07MB884; X-Forefront-PRVS: 044968D9E1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR07MB884; 23:+DMqQV/z7uLdoG5GJA/Km3Eenk3k6DI4J+AyvpZcT6?= =?us-ascii?Q?FtnNNZUw18afe0TyXM/PRm2IjeL4gH5AinUFoMmUmi6TUD2A4+Qhlyiat99V?= =?us-ascii?Q?C1jC3Tcr6Nzd6taJdXAFoLwY9I+lpCV+HYpc9h/ekpCockMTFX9KYEA3a+jL?= =?us-ascii?Q?RVBhm1gJF7/+ywrFYkYkpLKB9JIFtDguJW+77gFDcTqpyXoOewSBTY9hYgI4?= =?us-ascii?Q?J2lSOwV2NSkcpHFXBYt9xUN9sU0agD28bYJfti6ddboLQA7cr5DHOfAhLBOZ?= =?us-ascii?Q?r75/2pcjrfsILEIZEWElrLYPLFIeI2T4obIYFJUrjaY4rZVU7p4GVy5nn4hU?= =?us-ascii?Q?kicXczSexpHjB5cD8vFtNtyclfQ1zMc9QHMYSi3y9zgrsfHVET2HxEj1NiLQ?= =?us-ascii?Q?h4dAnkMXrBLntj7gFtdqdtcy/2bV0ythTPXCmRLYrdihZxiO8lUHMuOyfFhK?= =?us-ascii?Q?bQtIWzMA9Phj5i4lf4+YJk0zWvXO6dzlS8m4rR7mf1ufd0XJLDShPSWmdKnQ?= =?us-ascii?Q?/rZXzoxnqF9ElzkQ84cpwEZkHTTPrq9FSyCtOseV2Nhxaht33f9Jo/D76tJm?= =?us-ascii?Q?COfxMDnAGus7kDvwQS+MzRN01mQCXRISjpSMNOv0C8qfBZLPMPAFDuscKbPF?= =?us-ascii?Q?fLbSXCZ7Uw69sfcDtn7fPkEGzrMP/+At4681XudBU3pEoK8n68I6um1SG2J6?= =?us-ascii?Q?YiEZ0PM41eYEQruifEZR//yHDesQQSh63yxchR8UKY6xN/RthpAeM9qunIGp?= =?us-ascii?Q?bgk5ZKHsc0iKZp1FFvD4UIH4A5P5RFHWCUhoHAk/FH4oSTZSH2VC9DiYavsN?= =?us-ascii?Q?RGj5SpOY+eEqs3sgAKYLzJ02U2bMa88O8VEWiEIh4vyJ8dkh/9PFULUoVDyp?= =?us-ascii?Q?3AxQYdMU+vkPn4sJJGcxXfJEcEl8D1sVWtZaxAQX1wPl+yraTy+O5JliQs/Z?= =?us-ascii?Q?OSMHxw3IRzXa0vnN9cqGTtROc6h/jBr/7pGRk56gAD9J7zgguOh7qLcxqeai?= =?us-ascii?Q?k=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR07MB884; 6:G0KJmzjv5IROYgnZfMHJjuVi+Y7QInULJEf4PBOzx+UgWXA47emwHF+02CwHpnE4+ZCPLukkSanvCQBZ6MdeXGUKgrnuB9t8l+FLIItUSjhvgCkjk2jSLEQF/IjEXGxlmeHbVNVk5gPkTk+s+52Aj6GowDUsP6Y6SnqhGUb/c7zDKN2H8QRLIrrYQAmn8nnyqmb87a35HMM+P5FZEscC2e1idlbWWiZVu5C+zXeW2SafJRGAqVabH9g1DcISSDojpRgBRXazaMYcx1xnSiQYmhehs8N20gp7lLxgW5QSL40UklaWRrvdLqnHEA0G0zzF8jAKiLBzxNNRM4h6UZNPvg==; 5:W/OrGyH57GoVII2WcfLLVwhPBOnm/L2P4+wjP6u9u5SBNdIlJuJWls/J50bSKYkKSAwCpVKgRBIN3bvLOD74zPoyZzsn+GPiNjKmZRy9LL4iRQE1P8kg85C1wkWoZbfjfCI2Xkbqr0oHiTEM2X/tDQ==; 24:hCEu6FQ/wfReiCBTRR90fAgFsnDxL1W2nsa0GVUndIZf+6TANxNfmNtWRtqYMeyu3LZ1UbSWUvnVFKsd87sh2KQf6OIi/RZTrTyXLDWx6Hk=; 7:skt82L8Isbm89LpaDJG24Z8pOIUYUmN9nEEdzqh1+IZ+2pzxRDvcHuYfMER7fKFO4BbJ14/F3D0VmR4WXlVydAW26nVIw5t8nwH8e1zCkwrxOwaL4bgKPy1vh/8gziVVsL/05js0IDxIV7Lft+hnNMWLfI1iwbyf21sxo9yIiB8gPsJjHaMiasTNelHKEHU4xFzApaR0fbHdeFVrIllp229HNeMz5tl6n/GsQGlDk10= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2017 08:55:53.3479 (UTC) X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR07MB884 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: <linux-rdma.vger.kernel.org> X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/net/ethernet/qlogic/qed/qed_ll2.c b/drivers/net/ethernet/qlogic/qed/qed_ll2.c index 6d14474..8eb9645 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_ll2.c +++ b/drivers/net/ethernet/qlogic/qed/qed_ll2.c @@ -1613,7 +1613,12 @@ static void qed_ll2_prepare_tx_packet_set(struct qed_hwfn *p_hwfn, } start_bd = (struct core_tx_bd *)qed_chain_produce(p_tx_chain); - start_bd->nw_vlan_or_lb_echo = cpu_to_le16(pkt->vlan); + if (QED_IS_IWARP_PERSONALITY(p_hwfn) && + p_ll2->input.conn_type == QED_LL2_TYPE_OOO) + start_bd->nw_vlan_or_lb_echo = + cpu_to_le16(IWARP_LL2_IN_ORDER_TX_QUEUE); + else + start_bd->nw_vlan_or_lb_echo = cpu_to_le16(pkt->vlan); SET_FIELD(start_bd->bitfield1, CORE_TX_BD_L4_HDR_OFFSET_W, cpu_to_le16(pkt->l4_hdr_offset_w)); SET_FIELD(start_bd->bitfield1, CORE_TX_BD_TX_DST, tx_dest);