{"id":809079,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809079/?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-6-jiri@resnulli.us>","date":"2017-09-02T15:21:10","name":"[net-next,05/21] mlxsw: reg: Extract mlxsw_reg_ritr_mac_pack()","commit_ref":null,"pull_url":null,"state":"superseded","archived":true,"hash":"cdd9244466bdcb29b71b298b8bbca1d11a6b5dc6","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-6-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/809079/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=\"h5UzC/IK\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xl0Fh2k0Jz9sQl\n\tfor ;\n\tSun, 3 Sep 2017 01:21:44 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1752740AbdIBPVk (ORCPT );\n\tSat, 2 Sep 2017 11:21:40 -0400","from mail-wr0-f196.google.com ([209.85.128.196]:35838 \"EHLO\n\tmail-wr0-f196.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1752735AbdIBPVi (ORCPT\n\t); Sat, 2 Sep 2017 11:21:38 -0400","by mail-wr0-f196.google.com with SMTP id a47so1352473wra.2\n\tfor ; Sat, 02 Sep 2017 08:21:37 -0700 (PDT)","from localhost (jirka.pirko.cz. [84.16.102.26])\n\tby smtp.gmail.com with ESMTPSA id\n\tq201sm2453881wmg.48.2017.09.02.08.21.35\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tSat, 02 Sep 2017 08:21:36 -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=3oBUdATGTNYavgnSRcjqqkhSP2mx+6xAnmRHL0YU/EA=;\n\tb=h5UzC/IKvD1rNpjS63LoNqV4VfzbJDI4ebTeSL/cP1OFB4qINmLQNt2SuLL7WFPreY\n\t5tg6N/cNkwiqS0se+y/zvmxRr4K0gsmjTSII8DxA2FaBJpXqWQJFqon/fVmZv6nuHdIY\n\t3wtANGMWME8ajak1SjpuzXTm5jhxjI+eAjZyy538ssDmNUYlKLXSGKse/oRQx3AV/Xtk\n\tTaQHb2RCmm+79bUEWWGsovGIK/IH1y+srwEMP63g6vbP9fDXUvVW6F4aN/Axk219whQX\n\ti6NtPJi25LCL/oBsNGH+sjjgZnYt/m23fvwKzBwWZyCffC0zo3O0sY5mLAuJGFRoaq49\n\tXyYg==","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=3oBUdATGTNYavgnSRcjqqkhSP2mx+6xAnmRHL0YU/EA=;\n\tb=RhQcw8h1w3jbIzsnhSyZFC/ZNGBbTsrcdWpXMXvJGnA+cZw4v96yL2Atu80HxVjKVT\n\teFDkfRjwdrQoT8J2YBzubq2qPC47t9FBfTlgEYIgKBHzpzTw2+YJKoKSm0HOTMC+yogZ\n\tD4JFJmBdfkie/H0uuGIjF1J+u0+P6nN/os8pXvrtbmTHdcXHMquef7GpBlpJzEGvuFyq\n\tuwbGRWLe0ZFuVLmrMzvVlosFv+R6Ba2bNB/9X5aK7e0Ntq8x4+WPYwQRmuxiuVkKpvra\n\tQlkFY0zcjkIvGdBph+GQdfF6b5oqPhc9qWA7YgQPeYOeiH8auS4hPzOuaVfPFypmKKPI\n\tD1qw==","X-Gm-Message-State":"AHPjjUj7T05akO8mO48bWxOfs1rTTirm5s3uKl5+SqUiGWBOCaYmjWF9\n\tpX2lA0b+4ShYycK+lp4=","X-Google-Smtp-Source":"ADKCNb50DoTmq/k7PVuf/8N71/HhzYXNHR0A/HObSlpivwPZGfHI4+QdxHMTwk2PhxXnxa6ALJwrvA==","X-Received":"by 10.223.163.87 with SMTP id d23mr2721530wrb.84.1504365696830; \n\tSat, 02 Sep 2017 08:21:36 -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 05/21] mlxsw: reg: Extract mlxsw_reg_ritr_mac_pack()","Date":"Sat, 2 Sep 2017 17:21:10 +0200","Message-Id":"<20170902152126.17286-6-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\nUnlike other interface types, loopback RIFs do not have MAC address. So\ndrop the corresponding argument from mlxsw_reg_ritr_pack() and move it\nto a new function. Call that from callers of mlxsw_reg_ritr_pack.\n\nSigned-off-by: Petr Machata \nReviewed-by: Ido Schimmel \nSigned-off-by: Jiri Pirko \n---\n drivers/net/ethernet/mellanox/mlxsw/reg.h | 7 +++++--\n drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 7 ++++---\n 2 files changed, 9 insertions(+), 5 deletions(-)","diff":"diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h\nindex 24296cf..27a378d 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/reg.h\n+++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h\n@@ -4262,8 +4262,7 @@ static inline void mlxsw_reg_ritr_sp_if_pack(char *payload, bool lag,\n \n static inline void mlxsw_reg_ritr_pack(char *payload, bool enable,\n \t\t\t\t enum mlxsw_reg_ritr_if_type type,\n-\t\t\t\t u16 rif, u16 vr_id, u16 mtu,\n-\t\t\t\t const char *mac)\n+\t\t\t\t u16 rif, u16 vr_id, u16 mtu)\n {\n \tbool op = enable ? MLXSW_REG_RITR_RIF_CREATE : MLXSW_REG_RITR_RIF_DEL;\n \n@@ -4279,6 +4278,10 @@ static inline void mlxsw_reg_ritr_pack(char *payload, bool enable,\n \tmlxsw_reg_ritr_lb_en_set(payload, 1);\n \tmlxsw_reg_ritr_virtual_router_set(payload, vr_id);\n \tmlxsw_reg_ritr_mtu_set(payload, mtu);\n+}\n+\n+static inline void mlxsw_reg_ritr_mac_pack(char *payload, const char *mac)\n+{\n \tmlxsw_reg_ritr_if_mac_memcpy_to(payload, mac);\n }\n \ndiff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\nindex de15eac..3ddfbe3 100644\n--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c\n@@ -4955,8 +4955,8 @@ static int mlxsw_sp_rif_subport_op(struct mlxsw_sp_rif *rif, bool enable)\n \n \trif_subport = mlxsw_sp_rif_subport_rif(rif);\n \tmlxsw_reg_ritr_pack(ritr_pl, enable, MLXSW_REG_RITR_SP_IF,\n-\t\t\t rif->rif_index, rif->vr_id, rif->dev->mtu,\n-\t\t\t rif->dev->dev_addr);\n+\t\t\t rif->rif_index, rif->vr_id, rif->dev->mtu);\n+\tmlxsw_reg_ritr_mac_pack(ritr_pl, rif->dev->dev_addr);\n \tmlxsw_reg_ritr_sp_if_pack(ritr_pl, rif_subport->lag,\n \t\t\t\t rif_subport->lag ? rif_subport->lag_id :\n \t\t\t\t\t\t rif_subport->system_port,\n@@ -4998,7 +4998,8 @@ static int mlxsw_sp_rif_vlan_fid_op(struct mlxsw_sp_rif *rif,\n \tchar ritr_pl[MLXSW_REG_RITR_LEN];\n \n \tmlxsw_reg_ritr_pack(ritr_pl, enable, type, rif->rif_index, rif->vr_id,\n-\t\t\t rif->dev->mtu, rif->dev->dev_addr);\n+\t\t\t rif->dev->mtu);\n+\tmlxsw_reg_ritr_mac_pack(ritr_pl, rif->dev->dev_addr);\n \tmlxsw_reg_ritr_fid_set(ritr_pl, type, vid_fid);\n \n \treturn mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ritr), ritr_pl);\n","prefixes":["net-next","05/21"]}