From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,FROM_STARTS_WITH_NUMS,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02369C433DB for ; Sun, 21 Feb 2021 16:09:47 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9C38B64EF1 for ; Sun, 21 Feb 2021 16:09:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C38B64EF1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 59480833B7 for ; Sun, 21 Feb 2021 16:09:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ombubi_Lor3e for ; Sun, 21 Feb 2021 16:09:44 +0000 (UTC) Received: by smtp1.osuosl.org (Postfix, from userid 1001) id 503A18345D; Sun, 21 Feb 2021 16:09:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 3614E8343F; Sun, 21 Feb 2021 16:09:24 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 919411BF29E for ; Sun, 21 Feb 2021 16:09:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 75E89606D7 for ; Sun, 21 Feb 2021 16:09:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lyMnOFHodrNq for ; Sun, 21 Feb 2021 16:09:10 +0000 (UTC) Received: by smtp3.osuosl.org (Postfix, from userid 1001) id 7E7136F4A0; Sun, 21 Feb 2021 16:09:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by smtp3.osuosl.org (Postfix) with ESMTPS id A43186F545 for ; Sun, 21 Feb 2021 16:09:06 +0000 (UTC) Received: by mail-wr1-f51.google.com with SMTP id b3so16507285wrj.5 for ; Sun, 21 Feb 2021 08:09:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iSaQknB56Hbsfi3h3AYyJM+wIvNjIhn/f/ihkROsUQU=; b=FBbAZ1JXVysCmcMT4WtuTdqKeAOhO6jf2KNB5C6m/SRZOz0CnRBs3roy1yw554MAtL L2oE6dIKhmMFNEAP8kjnhTjnUhdzaHyCQImSR2tWeX7gfhWi9OOkbL8XX4rgcZAd/Ux9 WGVd2it9JeQK6tfMGdj/jT49VQPxPAdoyc/Xz3x93Kx6/Jr4Rhozx7bsra4ZcEZqv3Ei eV256A9V2RmD9BVYJA2Qp+QRJaaexPCsSQQq2egSYhnJ1yTA7u740oAhS4ntMvHdZxzU Pi/Uno9YXg/h7giHrhpnf7QAkVLTyEIvQ55FThdAxFzJoZkGadJkHTcSI8NXyVwMGoZS 18KQ== 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:mime-version:content-transfer-encoding; bh=iSaQknB56Hbsfi3h3AYyJM+wIvNjIhn/f/ihkROsUQU=; b=BR3XKGmvC8fHOtxZkxrWht+QAiijUDD8W6o1NlhbN8cUFbO0nzg79wVN3EXoDSdxxV PW8avNEozknzwiUgXL2VfRPXh+WqYDz+cUXjFhWbkiAGuXWHLK2S9o7rz5ecPr0PJsYM uB/WEG/bsmqbiI3wQd32SOLLduvWLo2taRKvT7TompD3lX0xqlx0wdKffffw1DBxnVG1 7AfvWF1Mh1CMBEoS4kMFXu0xRCt0oInAPEaNo3n7dyj1h6MISgI40uznNELPV1oXF0Us TJ+JHf8TSq8NtwYear8gptLRWDW70oFquTrRsLXRPfpwj1qV4Mpkt1dnIWwOFUrG2cCP /hWA== X-Gm-Message-State: AOAM5321Ybp7snfzdC6cemUthV3kCV3s7NHGzKT+32ScIwSZsasucAIf tevU64Hd0jC/PjpoCVhsNgk= X-Google-Smtp-Source: ABdhPJzBaG88h9m4FIUkeG9188um/sJsFSJNzWt/+UmvMxm2uHFkbE35YkNs3COayTvDpe4dEb4eWQ== X-Received: by 2002:adf:80e7:: with SMTP id 94mr17737815wrl.5.1613923744803; Sun, 21 Feb 2021 08:09:04 -0800 (PST) Received: from localhost.localdomain ([106.51.142.238]) by smtp.gmail.com with ESMTPSA id m4sm8961401wrb.87.2021.02.21.08.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 08:09:04 -0800 (PST) From: Shreesh Adiga <16567adigashreesh@gmail.com> To: Greg Kroah-Hartman Subject: [PATCH 2/2] staging: octeon: reduce indentation levels for functions in ethernet.c Date: Sun, 21 Feb 2021 21:35:45 +0530 Message-Id: <20210221160545.2967003-2-16567adigashreesh@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210221160545.2967003-1-16567adigashreesh@gmail.com> References: <20210221160545.2967003-1-16567adigashreesh@gmail.com> MIME-Version: 1.0 X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" The if condition was wrapping the whole body in three functions, it has been changed to return if the condition is false to reduce the indentation levels. Signed-off-by: Shreesh Adiga <16567adigashreesh@gmail.com> --- drivers/staging/octeon/ethernet.c | 194 +++++++++++++++--------------- 1 file changed, 94 insertions(+), 100 deletions(-) diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index af546ef41843..740f99911b28 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -251,40 +251,41 @@ static int cvm_oct_common_change_mtu(struct net_device *dev, int new_mtu) int vlan_bytes = 0; #endif int mtu_overhead = ETH_HLEN + ETH_FCS_LEN + vlan_bytes; + int index; + /* Add ethernet header and FCS, and VLAN if configured. */ + int max_packet = new_mtu + mtu_overhead; dev->mtu = new_mtu; - if (cvm_oct_validate_interface(interface)) { - int index = INDEX(priv->port); - /* Add ethernet header and FCS, and VLAN if configured. */ - int max_packet = new_mtu + mtu_overhead; + if (!cvm_oct_validate_interface(interface)) + return 0; - if (OCTEON_IS_MODEL(OCTEON_CN3XXX) || - OCTEON_IS_MODEL(OCTEON_CN58XX)) { - /* Signal errors on packets larger than the MTU */ - cvmx_write_csr(CVMX_GMXX_RXX_FRM_MAX(index, interface), - max_packet); - } else { - /* - * Set the hardware to truncate packets larger - * than the MTU and smaller the 64 bytes. - */ - union cvmx_pip_frm_len_chkx frm_len_chk; - - frm_len_chk.u64 = 0; - frm_len_chk.s.minlen = VLAN_ETH_ZLEN; - frm_len_chk.s.maxlen = max_packet; - cvmx_write_csr(CVMX_PIP_FRM_LEN_CHKX(interface), - frm_len_chk.u64); - } + index = INDEX(priv->port); + + if (OCTEON_IS_MODEL(OCTEON_CN3XXX) || OCTEON_IS_MODEL(OCTEON_CN58XX)) { + /* Signal errors on packets larger than the MTU */ + cvmx_write_csr(CVMX_GMXX_RXX_FRM_MAX(index, interface), + max_packet); + } else { /* - * Set the hardware to truncate packets larger than - * the MTU. The jabber register must be set to a - * multiple of 8 bytes, so round up. + * Set the hardware to truncate packets larger + * than the MTU and smaller the 64 bytes. */ - cvmx_write_csr(CVMX_GMXX_RXX_JABBER(index, interface), - (max_packet + 7) & ~7u); + union cvmx_pip_frm_len_chkx frm_len_chk; + + frm_len_chk.u64 = 0; + frm_len_chk.s.minlen = VLAN_ETH_ZLEN; + frm_len_chk.s.maxlen = max_packet; + cvmx_write_csr(CVMX_PIP_FRM_LEN_CHKX(interface), + frm_len_chk.u64); } + /* + * Set the hardware to truncate packets larger than + * the MTU. The jabber register must be set to a + * multiple of 8 bytes, so round up. + */ + cvmx_write_csr(CVMX_GMXX_RXX_JABBER(index, interface), + (max_packet + 7) & ~7u); return 0; } @@ -297,49 +298,46 @@ static void cvm_oct_common_set_multicast_list(struct net_device *dev) union cvmx_gmxx_prtx_cfg gmx_cfg; struct octeon_ethernet *priv = netdev_priv(dev); int interface = INTERFACE(priv->port); + union cvmx_gmxx_rxx_adr_ctl control; + int index; - if (cvm_oct_validate_interface(interface)) { - union cvmx_gmxx_rxx_adr_ctl control; - int index = INDEX(priv->port); - - control.u64 = 0; - control.s.bcst = 1; /* Allow broadcast MAC addresses */ - - if (!netdev_mc_empty(dev) || (dev->flags & IFF_ALLMULTI) || - (dev->flags & IFF_PROMISC)) - /* Force accept multicast packets */ - control.s.mcst = 2; - else - /* Force reject multicast packets */ - control.s.mcst = 1; - - if (dev->flags & IFF_PROMISC) - /* - * Reject matches if promisc. Since CAM is - * shut off, should accept everything. - */ - control.s.cam_mode = 0; - else - /* Filter packets based on the CAM */ - control.s.cam_mode = 1; - - gmx_cfg.u64 = - cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface)); - cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), - gmx_cfg.u64 & ~1ull); - - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CTL(index, interface), - control.u64); - if (dev->flags & IFF_PROMISC) - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM_EN - (index, interface), 0); - else - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM_EN - (index, interface), 1); - - cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), - gmx_cfg.u64); - } + if (!cvm_oct_validate_interface(interface)) + return; + + index = INDEX(priv->port); + + control.u64 = 0; + control.s.bcst = 1; /* Allow broadcast MAC addresses */ + + if (!netdev_mc_empty(dev) || (dev->flags & IFF_ALLMULTI) || + (dev->flags & IFF_PROMISC)) + /* Force accept multicast packets */ + control.s.mcst = 2; + else + /* Force reject multicast packets */ + control.s.mcst = 1; + + if (dev->flags & IFF_PROMISC) + /* + * Reject matches if promisc. Since CAM is + * shut off, should accept everything. + */ + control.s.cam_mode = 0; + else + /* Filter packets based on the CAM */ + control.s.cam_mode = 1; + + gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface)); + cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), + gmx_cfg.u64 & ~1ull); + + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CTL(index, interface), control.u64); + if (dev->flags & IFF_PROMISC) + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM_EN(index, interface), 0); + else + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM_EN(index, interface), 1); + + cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64); } static int cvm_oct_set_mac_filter(struct net_device *dev) @@ -347,38 +345,34 @@ static int cvm_oct_set_mac_filter(struct net_device *dev) struct octeon_ethernet *priv = netdev_priv(dev); union cvmx_gmxx_prtx_cfg gmx_cfg; int interface = INTERFACE(priv->port); + int i; + u64 mac = 0; + u8 *ptr; + int index; + + if (!cvm_oct_validate_interface(interface)) + return 0; + + ptr = dev->dev_addr; + index = INDEX(priv->port); + + for (i = 0; i < 6; i++) + mac = (mac << 8) | (u64)ptr[i]; + + gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface)); + cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), + gmx_cfg.u64 & ~1ull); + + cvmx_write_csr(CVMX_GMXX_SMACX(index, interface), mac); + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM0(index, interface), ptr[0]); + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM1(index, interface), ptr[1]); + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM2(index, interface), ptr[2]); + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM3(index, interface), ptr[3]); + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM4(index, interface), ptr[4]); + cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM5(index, interface), ptr[5]); + cvm_oct_common_set_multicast_list(dev); + cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64); - if (cvm_oct_validate_interface(interface)) { - int i; - u8 *ptr = dev->dev_addr; - u64 mac = 0; - int index = INDEX(priv->port); - - for (i = 0; i < 6; i++) - mac = (mac << 8) | (u64)ptr[i]; - - gmx_cfg.u64 = - cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface)); - cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), - gmx_cfg.u64 & ~1ull); - - cvmx_write_csr(CVMX_GMXX_SMACX(index, interface), mac); - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM0(index, interface), - ptr[0]); - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM1(index, interface), - ptr[1]); - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM2(index, interface), - ptr[2]); - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM3(index, interface), - ptr[3]); - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM4(index, interface), - ptr[4]); - cvmx_write_csr(CVMX_GMXX_RXX_ADR_CAM5(index, interface), - ptr[5]); - cvm_oct_common_set_multicast_list(dev); - cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), - gmx_cfg.u64); - } return 0; } -- 2.30.0 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel