{"id":809096,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809096/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170902152126.17286-7-jiri@resnulli.us>","date":"2017-09-02T15:21:11","name":"[net-next,06/21] mlxsw: reg: Give mlxsw_reg_ratr_pack a type parameter","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"2f3d58e1a4709ceb0ff8cb04a3432ddc429f7964","submitter":{"id":15321,"url":"http://patchwork.ozlabs.org/api/1.0/people/15321/?format=json","name":"Jiri Pirko","email":"jiri@resnulli.us"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170902152126.17286-7-jiri@resnulli.us/mbox/","series":[{"id":1159,"url":"http://patchwork.ozlabs.org/api/1.0/series/1159/?format=json","date":"2017-09-02T15:21:05","name":"mlxsw: Offloading GRE tunnels","version":1,"mbox":"http://patchwork.ozlabs.org/series/1159/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809096/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=resnulli-us.20150623.gappssmtp.com\n\theader.i=@resnulli-us.20150623.gappssmtp.com\n\theader.b=\"xwiQuyNp\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xl0H749dVz9sRY\n\tfor ;\n\tSun, 3 Sep 2017 01:22:59 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752837AbdIBPWx (ORCPT );\n\tSat, 2 Sep 2017 11:22:53 -0400","from mail-wr0-f195.google.com ([209.85.128.195]:37351 \"EHLO\n\tmail-wr0-f195.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752660AbdIBPVj (ORCPT\n\t); Sat, 2 Sep 2017 11:21:39 -0400","by mail-wr0-f195.google.com with SMTP id y15so852255wrc.4\n\tfor ; Sat, 02 Sep 2017 08:21:39 -0700 (PDT)","from localhost (jirka.pirko.cz. [84.16.102.26])\n\tby smtp.gmail.com with ESMTPSA id\n\tm16sm1882993wrg.16.2017.09.02.08.21.37\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tSat, 02 Sep 2017 08:21:37 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=resnulli-us.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=0AQoveP55S/NwRLoUTDk31U6EymBMKbbx7uDXhapXck=;\n\tb=xwiQuyNpcT79Tc5BWPu1iu9AJao1dtZkAkJEtKD4Y5kWvHsKS2LIQIF+F0j7Wu1qqo\n\tJT53jOSo1Hg90RNXqVPdSGprvWENFhSfgtyXylp7v0KG205ARfG1qT0ZzKryN0j5w+KZ\n\tVcQzWFi75NsJVARPVHCurB/E4qqEtECf4kvXMmGSF5n2xtvjpvGNtTTFW8zS+pjM7dCx\n\tDIy58w3alDri5sGHpXss3ImrdD/OnwlYYsCOopLngIw5W0ZRxNifj1+toFY7++ngXfAl\n\tLVe3m6ARySh+2yAYHuBrE5YFs4bNJdX/j37iN8taEZgc3Fo2icUgSktl6amZU9O1XKMo\n\tIxqg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=0AQoveP55S/NwRLoUTDk31U6EymBMKbbx7uDXhapXck=;\n\tb=jm+6SPsjmYa5/p42IUGzoSdVlXb4gwKpFn7kgGPgPAcVmgQAPC42OQn1+PLdADOEig\n\trcUWo/XZMKT/1Hj8yr7AJQccgz03iSJgwNPY3zsugkcLE2/dnfJdmzdlb64v7bfbuPqe\n\tisxH6m+Ba1u6WTkqorTdQl9saM1YBwCPH9a/BLldMaE4sZo8SWqR2mSBd6+lm2AwUlYG\n\tq8Elge4N1JPU40VwkrAlJ1nQzFEbW675gny5GlzOxZhoCAmHXMarmrQaSBepRlgSDL1q\n\t8umF01ms1Pg1vxw00g5GimH7PfQT1PKsa0u9lktsZra5BoDMTYw5q/4HraXbyllsue+J\n\tjh9A==","X-Gm-Message-State":"AHPjjUh3b0seU1XsOrUxwj9MnXjF7F0dsqduD7yx9k0ghOudBO7AnYpF\n\tYQ5CoXch4tcd3WJBd3o=","X-Google-Smtp-Source":"ADKCNb7kHDEYJ/P5gJrfHU5ZB0jNTlB1PA1KgQTrhXwhQDKtOvCSOZbnU9Z4/JjHXaYjPE/U9vwY7A==","X-Received":"by 10.223.150.35 with SMTP id b32mr2923962wra.87.1504365698245; \n\tSat, 02 Sep 2017 08:21:38 -0700 (PDT)","From":"Jiri Pirko ","To":"netdev@vger.kernel.org","Cc":"davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com,\n\tmlxsw@mellanox.com","Subject":"[patch net-next 06/21] mlxsw: reg: Give mlxsw_reg_ratr_pack a type\n\tparameter","Date":"Sat, 2 Sep 2017 17:21:11 +0200","Message-Id":"<20170902152126.17286-7-jiri@resnulli.us>","X-Mailer":"git-send-email 2.9.3","In-Reply-To":"<20170902152126.17286-1-jiri@resnulli.us>","References":"<20170902152126.17286-1-jiri@resnulli.us>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Petr Machata \n\nTo support IPIP, the driver needs to be able to construct an IPIP\nadjacency. Change mlxsw_reg_ratr_pack to take an adjacency type as an\nargument. Adjust the one existing caller.\n\nSigned-off-by: Petr Machata \nReviewed-by: Ido Schimmel \nSigned-off-by: Jiri Pirko \n---\n drivers/net/ethernet/mellanox/mlxsw/reg.h | 2 ++\n drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 3 ++-\n 2 files changed, 4 insertions(+), 1 deletion(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h\nindex 27a378d..680bc7e 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h\n@@ -4482,11 +4482,13 @@ MLXSW_ITEM32(reg, ratr, ipip_ipv6_ptr, 0x1C, 0, 24);\n static inline void\n mlxsw_reg_ratr_pack(char *payload,\n \t\t enum mlxsw_reg_ratr_op op, bool valid,\n+\t\t enum mlxsw_reg_ratr_type type,\n \t\t u32 adjacency_index, u16 egress_rif)\n {\n \tMLXSW_REG_ZERO(ratr, payload);\n \tmlxsw_reg_ratr_op_set(payload, op);\n \tmlxsw_reg_ratr_v_set(payload, valid);\n+\tmlxsw_reg_ratr_type_set(payload, type);\n \tmlxsw_reg_ratr_adjacency_index_low_set(payload, adjacency_index);\n \tmlxsw_reg_ratr_adjacency_index_high_set(payload, adjacency_index >> 16);\n \tmlxsw_reg_ratr_egress_router_interface_set(payload, egress_rif);\ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex 3ddfbe3..4e47d45 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -1928,7 +1928,8 @@ static int mlxsw_sp_nexthop_mac_update(struct mlxsw_sp *mlxsw_sp, u32 adj_index,\n \tchar ratr_pl[MLXSW_REG_RATR_LEN];\n \n \tmlxsw_reg_ratr_pack(ratr_pl, MLXSW_REG_RATR_OP_WRITE_WRITE_ENTRY,\n-\t\t\t true, adj_index, neigh_entry->rif);\n+\t\t\t true, MLXSW_REG_RATR_TYPE_ETHERNET,\n+\t\t\t adj_index, neigh_entry->rif);\n \tmlxsw_reg_ratr_eth_entry_pack(ratr_pl, neigh_entry->ha);\n \treturn mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ratr), ratr_pl);\n }\n","prefixes":["net-next","06/21"]}