From patchwork Sat Sep 2 21:49:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 809170 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="QBBhskl6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xl8tv1q24z9sRY for ; Sun, 3 Sep 2017 07:51:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752965AbdIBVvB (ORCPT ); Sat, 2 Sep 2017 17:51:01 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:36641 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752761AbdIBVtn (ORCPT ); Sat, 2 Sep 2017 17:49:43 -0400 Received: by mail-wr0-f194.google.com with SMTP id 40so1620578wrv.3 for ; Sat, 02 Sep 2017 14:49:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EaDouSy9DdrV6ciGe8GtuKFnzunYQFlHo93maNyl1t0=; b=QBBhskl6H4yUe6Gp32nF5sieCzamtS7BPMPM33c4wJCMOxwMZnALnWcJyWZg12nBnt amgX2uDxNsoA6IP529zhyoTc0VHHI1F/rfTTRWCnYB91Cduy7lwMHWKapOA06Mgv0dgc 2ABL5gSLOE62DhZiaNkBv4PAtJS1YIG4n7Ends/0a6viDIFqjM08gbupE0p6KOpjPPFv ZFXvEEqZD2NCbxk/eERmw31/oUcvotZuC/1306qFSwZ5B8/pJqpJ76P56+GQp9B2Q6vN LFfpduUwz7YCuJIh8YiEulMfW49Ds8AW6Og/QxQJV8Vth/WNPo9/+99GwlfD04zvjjjY ZhsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EaDouSy9DdrV6ciGe8GtuKFnzunYQFlHo93maNyl1t0=; b=YqK6xXL20Gj08MtW0AbHuB1BSDFCIUK7bcqE/kxbFUB8r609402abbcXAeKiG3FAcB Oyw+H1MYdT0TOqdrt2AL+Uc/il2/jZzOd37G3A0SjaqoF6fpMI/B+nyk9ERxjMXyDBLv SQaADhvSHB18HGpXtKjt+WHlHmu2pkJZK8xdawD0s0MUrNeTBEyWdAuV6vJPr9R75Ute f0M0aveF6/Udc6ZfG5I7TWA2zn+gsiREOLs1MysbRY/zpUT2fwnEthEGASY1C6m8VW8m DT3CosLtvTfZ3nP7wOYTbJJ3OExfrBtjSL6i623mhIkVA/ESTdCGQL0TKkdXwPEHkpcn QLDA== X-Gm-Message-State: AHPjjUjV/QmqglW/kxpp58EnCgS0ukGMmTBlsRzIES2rOlYAjCfL8KyK NKDPzNn9eQ47Fd20T3s= X-Google-Smtp-Source: ADKCNb5wG0yhU0nUmHGYb292RJpkLDnvjdpYqFJlis4+NEQ/mu+LOkIp748G8RBT3rkVzooJcctbQg== X-Received: by 10.223.133.245 with SMTP id 50mr3413485wru.22.1504388981427; Sat, 02 Sep 2017 14:49:41 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id r65sm1669368wmf.19.2017.09.02.14.49.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 02 Sep 2017 14:49:40 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, petrm@mellanox.com, idosch@mellanox.com, mlxsw@mellanox.com Subject: [patch net-next v2 06/21] mlxsw: reg: Extract mlxsw_reg_ritr_mac_pack() Date: Sat, 2 Sep 2017 23:49:14 +0200 Message-Id: <20170902214929.2890-7-jiri@resnulli.us> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170902214929.2890-1-jiri@resnulli.us> References: <20170902214929.2890-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata Unlike other interface types, loopback RIFs do not have MAC address. So drop the corresponding argument from mlxsw_reg_ritr_pack() and move it to a new function. Call that from callers of mlxsw_reg_ritr_pack. Signed-off-by: Petr Machata Reviewed-by: Ido Schimmel Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/reg.h | 7 +++++-- drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h index a6eb96f..d80cf9b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/reg.h +++ b/drivers/net/ethernet/mellanox/mlxsw/reg.h @@ -4263,8 +4263,7 @@ static inline void mlxsw_reg_ritr_sp_if_pack(char *payload, bool lag, static inline void mlxsw_reg_ritr_pack(char *payload, bool enable, enum mlxsw_reg_ritr_if_type type, - u16 rif, u16 vr_id, u16 mtu, - const char *mac) + u16 rif, u16 vr_id, u16 mtu) { bool op = enable ? MLXSW_REG_RITR_RIF_CREATE : MLXSW_REG_RITR_RIF_DEL; @@ -4280,6 +4279,10 @@ static inline void mlxsw_reg_ritr_pack(char *payload, bool enable, mlxsw_reg_ritr_lb_en_set(payload, 1); mlxsw_reg_ritr_virtual_router_set(payload, vr_id); mlxsw_reg_ritr_mtu_set(payload, mtu); +} + +static inline void mlxsw_reg_ritr_mac_pack(char *payload, const char *mac) +{ mlxsw_reg_ritr_if_mac_memcpy_to(payload, mac); } diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index de15eac..3ddfbe3 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -4955,8 +4955,8 @@ static int mlxsw_sp_rif_subport_op(struct mlxsw_sp_rif *rif, bool enable) rif_subport = mlxsw_sp_rif_subport_rif(rif); mlxsw_reg_ritr_pack(ritr_pl, enable, MLXSW_REG_RITR_SP_IF, - rif->rif_index, rif->vr_id, rif->dev->mtu, - rif->dev->dev_addr); + rif->rif_index, rif->vr_id, rif->dev->mtu); + mlxsw_reg_ritr_mac_pack(ritr_pl, rif->dev->dev_addr); mlxsw_reg_ritr_sp_if_pack(ritr_pl, rif_subport->lag, rif_subport->lag ? rif_subport->lag_id : rif_subport->system_port, @@ -4998,7 +4998,8 @@ static int mlxsw_sp_rif_vlan_fid_op(struct mlxsw_sp_rif *rif, char ritr_pl[MLXSW_REG_RITR_LEN]; mlxsw_reg_ritr_pack(ritr_pl, enable, type, rif->rif_index, rif->vr_id, - rif->dev->mtu, rif->dev->dev_addr); + rif->dev->mtu); + mlxsw_reg_ritr_mac_pack(ritr_pl, rif->dev->dev_addr); mlxsw_reg_ritr_fid_set(ritr_pl, type, vid_fid); return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ritr), ritr_pl);