Message ID | 1507541874-18344-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 A6BF560223 for <patchwork-linux-rdma@patchwork.kernel.org>; Mon, 9 Oct 2017 09:39:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98AEA285E2 for <patchwork-linux-rdma@patchwork.kernel.org>; Mon, 9 Oct 2017 09:39:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D63D2876E; Mon, 9 Oct 2017 09:39:04 +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 E504228764 for <patchwork-linux-rdma@patchwork.kernel.org>; Mon, 9 Oct 2017 09:39:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754079AbdJIJix (ORCPT <rfc822;patchwork-linux-rdma@patchwork.kernel.org>); Mon, 9 Oct 2017 05:38:53 -0400 Received: from mail-co1nam03on0051.outbound.protection.outlook.com ([104.47.40.51]:50040 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754052AbdJIJin (ORCPT <rfc822;linux-rdma@vger.kernel.org>); Mon, 9 Oct 2017 05:38:43 -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=USOqWHUdeA4TA4aaffzRU8YrKwBZkM2Rp6FNJWAj6an6UY/RI9HNX7qBjevI/5+NtMtQD3yjtFI3/ZwIXnmdeQWMzdaEnamRiukKPQ7Nod1xtpvDnbElTJ/insmYnLQ8OvKaL8vITdpn/xwN2TJexVUtLF47itiyzWXdnoPbwdw= Received: from SN1PR0701CA0035.namprd07.prod.outlook.com (10.162.96.45) by CY1PR0701MB1945.namprd07.prod.outlook.com (10.163.141.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Mon, 9 Oct 2017 09:38:41 +0000 Received: from BL2FFO11FD049.protection.gbl (2a01:111:f400:7c09::133) by SN1PR0701CA0035.outlook.office365.com (2a01:111:e400:5173::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.7 via Frontend Transport; Mon, 9 Oct 2017 09:38:41 +0000 Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) 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; Mon, 9 Oct 2017 09:38:41 +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; Mon, 9 Oct 2017 02:38:38 -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 v3 net-next 05/12] qed: Add the source of a packet sent on an iWARP ll2 connection Date: Mon, 9 Oct 2017 12:37:47 +0300 Message-ID: <1507541874-18344-6-git-send-email-Michal.Kalderon@cavium.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1507541874-18344-1-git-send-email-Michal.Kalderon@cavium.com> References: <1507541874-18344-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)(346002)(376002)(2980300002)(428002)(189002)(199003)(16586007)(47776003)(101416001)(76176999)(50986999)(54906003)(104016004)(189998001)(48376002)(50466002)(2351001)(50226002)(106466001)(105586002)(356003)(305945005)(81166006)(8676002)(81156014)(8936002)(5660300001)(77096006)(478600001)(316002)(36756003)(2906002)(72206003)(69596002)(86362001)(5003940100001)(4326008)(6666003)(6916009)(2950100002)(107886003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB1945; 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; BL2FFO11FD049; 1:iXVpy1NBPKRqi+QEHhQY2Fkt4igeqiSSFo7At4FyZY0CqP635xKb/JB+3uQ1CgbGpcuokrgzWsLr0N6zZu3ALRGHwOfUJtr/AT7gduXzFZ4tDFdFLe+wktYl71pYkhZW X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5ddcc300-0219-43a3-4fda-08d50ef986ef X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:CY1PR0701MB1945; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1945; 3:0zJEAI7knVF1aCV7GySjEBGAlfh5Fm8phBDN/1YMNdxnnLiAK1o5LvdUKS6wN2f1Scj2FvHSAPzfigY/y5lObTEm+Cza8HrxR0/uwOkAjdTbRiO2B447PQT75v/2qF//xofylFsxZp/hW5b0Adg5KmYUYtghrt59Lk5z1bafNPHg468uoFdksmvfC4923ykRCgkyz/asm/ul76tKSNhNdy9AyZzhtCPwKMdg9JZcjR+W6Ko7l2atubOcA7buvRqBaGfnkXOCsf6P+WD6XKmuj3ukubj6wQzSusep2JmwKejHLIyzxvNVm7u/GAOZh9dpVaJD4uldX6BKUoZi2kQ2ueCyXgLrQTrGWQzYWBo8+6I=; 25:lMqgUO2zFIFiYWnwatdwiYgYDOr7om4FLtPkuRsxMXWcsk1pvx8Qp1SaaNWFuesmr+eQoy+wDrjKCukcXgxbw2N0HnYCSOaxoIgyt2ZArqPZYv6lLMcx6xSbzZ3sa/d3KDqmE+rTqKxi9XsghXzGVPmOHSizxDoOeSFLMFzTlzLnESVnzhW9kwmZ8+3A2tuaBms4YXsyhwPphkboT5llWyfl/GyynnehODZ/T2XKhMr4l2Bmhyqlq08jeVrs6ubys6qsp6aPqPkV5jqnxz5PeXsMpsbhqOmNpe3S/Njo+2Goz2EG7eS6DEAGNgRZlubsDdaxctbLEEaSOMGEkH3sWA== X-MS-TrafficTypeDiagnostic: CY1PR0701MB1945: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1945; 31:rWfqQw5scpoaeplSpXadb3cuhA6nZMUXh/9gyEc031XA8KBsC66MypBX7eYAsIrpJckUK9PJvR5VtraPisN576GK28DS7bX5zogdF8W1ZklScmAtC5wQc+qYxGoCJuto8jJOeP5Vf6kMCyTOA1JDDIsCMBOY1Kwe1PAlZv7ds/AdPP6mOkag4vlLfYEtcA9oYjYd5adi3JOJDvw7BP9AiS9YOiNiYk97SDoFgm+qyd4=; 20:fdZWY8Ch8Vtxg1LqfLfkavz8Ea/ocXjtYW73X92GTXZ/mhcCkUUG+fTkA8M2gIunvOvIeAeiQOoPO05NRh8XQqSaqWdAWRw0+oSBHFo5eLxcvWu/idNqT6K6lPYNKmhHiBLqCr1ZEkgYnvsmRrXZKbTRi9dudjS40tcz4+qmGJ5iW8HL3odoBUBlB8gtTsLs6MGjQ1ZErvkbwn0FZNNhnaDu0VBkaFhl2BKqTxsnqxM5T/Qf4mNNJ93oprFJPwE4FC30Co6jm+aMYvhM85fpEWjQRZSGeG8MKpS3s30bMJ6cICJCFZOeB0WCr/J4BZPrrRZg4MbVd89PFlmp20wTwKsaMdweRCy6oCxhWf3YIx4nVxArPSR+kYUuhAvzjAnKP33XNo5tI/mAV3txDQjwwBk+xy7vvrDYNtOvtqexEAvC/cky6N4z+XfyngtHrKKOXfTzX75vpQ5Gi5c8fb2KAAEiVnCWVvH+liBwFypEipZQ7KuJMkB8OJ/VPsAWC5Mr X-Exchange-Antispam-Report-Test: UriScan:(17755550239193); X-Microsoft-Antispam-PRVS: <CY1PR0701MB1945A9EF8BE94031001867BB88740@CY1PR0701MB1945.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)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123560025)(20161123555025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR0701MB1945; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR0701MB1945; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1945; 4:5NhURoWI+mjrkYv+LlhJEj3OrQgUoUZpuNoe5+6VcA9ry0vuSppzs6gMODDJx9i9exbJvs3DyFX95W+6iaI0ycQRPsYXoO/+SeHvXfXBETe4tnLWKWpHolZyXMgJkm3Gv+3hxkkSkjqmzet3T8CdYpNSVMjM6ZJhxHA0XwFJMtnYIUAxAK0Z5dWt9p4Ccm+pFbiLE265h3L03nBvfRo0VUyML18/zZ/iLNaP18Qi6meYG2FG93JO2XE7kP36noL9foAUI0xtKnKEAbbqUL9oU4dPkA0F3J7X7aS2zku7bo0= X-Forefront-PRVS: 045584D28C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0701MB1945; 23:rGpd7bnDQL58tnC0rN0CaEQ4O7yXHAdcXY8XPUn?= =?us-ascii?Q?aTOiAfYpZoZAI0f/z/6lsxxvTX36cpNqbhP9FKrlxXB7vOPv5JDUmAQ9pBcR?= =?us-ascii?Q?6j1sN8k412NS8D0yiqcfdgSYKN/ikjdib0y2/fF97ZbqWM1ipZjz9ErV5zV5?= =?us-ascii?Q?RGRRZJE+JkAr3bIi1bT3b4CH3mCQtkc8V65Q9dvMh1wiskM4keAYOU+uXIze?= =?us-ascii?Q?j7H3IjCAAOo8RsSd7LwVQP0TOaAo7zC8ibNp1i2I6DQBVNdwrBBXKfybIG9l?= =?us-ascii?Q?e0XksKLWgshzqRbyAO+665vQWeGiKJVb38f2BXhUPZPk0T2JFOrYsl4nu6LA?= =?us-ascii?Q?CbgWGY89nNcdstTpwdBgP6MWjTG08T502kdeRCvM7vDZ6Jng4J3LYZaZvN4O?= =?us-ascii?Q?OB/DN2ajwf9d9qvsW8PPLgb0vi4CZEu+LM/hzSy+qT4ABz5qerGUHzPVbwLQ?= =?us-ascii?Q?SDCQGmicQYuUGudjP8lgg6WGeYLspdU4+0bxf4VpFAzvlRvsXDcWhNQgFjt3?= =?us-ascii?Q?QV/cnoMc/bCqtPqNqitFiO41KgRsfqrFhmFwRZv0zf33nB7mDi981z4Ec8kG?= =?us-ascii?Q?Ifi20+ruFsLxwb2XlZ3CegvX2b+zJhqr1HSG5pGpexV5IgCNC0z/9KWbwzi3?= =?us-ascii?Q?E78B4bpxYJlpYHbdOK9/xpWu0SHxCag4kMCkXwD8prex4Nku6inDkVSBqFmS?= =?us-ascii?Q?d1ZgqadWXsgGi6a+3cCwVjDPT0wIl6GVYZTr66swtdbIWASet3lSlv2Geahq?= =?us-ascii?Q?GPjN0CHhFbnhIbh+VZ46Gz63pgH/sItft3d6qqhgH1nEEMT42tFObPKXgOtC?= =?us-ascii?Q?e8SRhbDSQU+tctVjyuA8CTQt7Ol8bMAlT+hZ2Ul6B5OS2ktt+FP2tPURnJ3q?= =?us-ascii?Q?L3RUrvSp1oKDNnfug7olRJHZNClvHLtQD39qS028DXty7PJN+eqAfdOOsxnE?= =?us-ascii?Q?YqH4/Royecrh+bAlviwd5EF4kSsN+YPNtUk/JFCFOxEmDK3njbbMdxKc9DD7?= =?us-ascii?Q?jZ46csSoi38o7vGWtkdHhcsCu?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1945; 6:MZKQGHvjF+jMo1S4Al94pcQtOHzLRSHAKbbeF1RCe/GBzx/PjpurB0Bf89m+cIoWDYyGgYjsZ1OzvnV3iXD9fUdTxvsmMXFIbMR07upZ22H5SWC0Q4OlFVC0MhU9aSZCnTnuSZYLT+wXl4yWOzXTlQ6Kyq+zmlWl3UdndUM0UWyU7A/NTWpXRymj3USsWH+AEz7kR7bQoDooLNa9P0DT4Algn9ii0WvMQeW41TM7mR/UaMv2TDzZKoNV+S8cP9hBzR32yAfLy0kSQvGABsW6tJM8ricFiU/5LtsTldvuczPSq0zrqQcsdZtdcK3mYh2crKSVZeSRiFdcKdKJ9e440A==; 5:MhMVT7NPuV7p33Nvq/BqPMwfDmOCD8ac93RYo0vv9aK3KkFSQKQLpieSr3aQ4RViUTxfXCbUbzS9QcSO79NCKrgJ67oknzgoxTxEg9PsU10MatycJtv/NK2RRs3OgYrGTVotUrVtkBfGS+QrrHHq8Q==; 24:JBBnwA7TiOYidWeOR+SZpKMiMi0UyrrOUr9zufOx0cbMN9hXKUSZBeYS0yhy+Ba9xCKwvfPuP/lVuqkOrfr+sVQZGNY4pddjF0JgcRZazh8=; 7:DYW0wc+3oufQxq8mzNEMbRvxGE+HY9wJBilifxPQBV2eI6HN4146eIE1KugQQ9PRTgIKJ6bt2GSaccCZq77mqEH6w+8Ka9xK7cuUfELkwJA9zTC8rZgOa9Azk0cqz914fswly+rV9IRt18BKu9mzLpCto2g9nVs1gm4+gutDLN42v8veJimKZtDxgx3yFdjxoFmC3aGTus0b0BWBbZ1ROXSbjKi8l/U4Z4lB3/If4R4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2017 09:38:41.2681 (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: CY1PR0701MB1945 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);