From patchwork Wed May 10 08:53:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 760489 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wN97l1gg4z9s2P for ; Wed, 10 May 2017 18:56:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752911AbdEJIyt (ORCPT ); Wed, 10 May 2017 04:54:49 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:54112 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752875AbdEJIyq (ORCPT ); Wed, 10 May 2017 04:54:46 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.47.221]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lvjxc-1e6gju3bES-017ZDo; Wed, 10 May 2017 10:53:31 +0200 From: Stefan Wahren To: Rob Herring , "David S. Miller" Cc: Mark Rutland , Greg Kroah-Hartman , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, Stefan Wahren Subject: [PATCH v5 05/17] net: qualcomm: Improve readability of length defines Date: Wed, 10 May 2017 10:53:16 +0200 Message-Id: <1494406408-31760-6-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1494406408-31760-1-git-send-email-stefan.wahren@i2se.com> References: <1494406408-31760-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:NO7m8mGeCiR5wI3ZT8LzMqVraE0986eobZPclAkV9OtDHTLTiey A4MpNW+0U2MHehYrUbLsxb+eaq6ew8AwcwVzgXWlYNX0NoDXNfYxxDm2wxDom8mJx8m5Yhk j18WIuemA2KgXPCKK+x21jmfivUBK59HhTPsgaA5VK+QLcUbRe+Zd+CisuNN9JBlCioZcLT edUb+bbU+9iE8E2IcGXCQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:nBmXNdWCaYI=:u9bimOYq+iay02kb1njsty r71yc4D8fCaF9bTQdKYspgLL//YGDcHojkKeaCjePIxsne2YPY5+tP8wcvcaB/1BkwZb4EDjN mE9xcVVv/bG0WDuzAWezpByw87m3rq+k2D/1NvbM28qryQPfQsPOcklTrPhb+VpO5Jtv/ZUb/ thvAl8+YOwAz//V3lKyCWv3d5boBdyUHHYWRW9prTQWlZczPtvh1ZXr7UGHpt8xRJS+z+BXC9 H/ynYQnJ2DIU+sbd2Aftl6uBzlyqV+au1T0L7CNNoJExLN88FTgfn9ldV61ifhUOpaWH4qg5G +WEUjCV78Y5BClmqyj3qd0xK50cehuDh+yciNyAZdh56P4vSrzU/dm8/UJvVs8rR62x20K+2t KudwrnAEyiGDfONgtXCb8lilelJ2Bz+Jb8/JqdIz6QOKOXTElbyJRmBQ0kgpGy9Vm5omcbCET +xrxVbDhudnHxKZaCJxQ95Yc7KQWZckZzgb7OwCaS5l4t+FXZOckPyGO1U7iuSG514nOaPXpi J+EtKtK+qPE27pMxEGxgPC3kQCuzepz5xP32NTiuhHVzbXpKSggudzfo/8XVOr2ptrA1SnXV+ UKtodWRStAQ/SgCPTGlOgjbX202QxHVnTVr0/opiBrqcPLFZnD9Kvp+TuZ75eyNzIQow0ElG/ cle3aLRPEoggJBnKUo1QmTYcQU94Z1e27pR+w/w+G7jfoLJ5qxJkUcUKmCdFtXI/pers= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In order to avoid mixing things up, make the MTU and frame length defines easier to read. Signed-off-by: Stefan Wahren --- drivers/net/ethernet/qualcomm/qca_framing.c | 2 +- drivers/net/ethernet/qualcomm/qca_framing.h | 8 ++++---- drivers/net/ethernet/qualcomm/qca_spi.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/qualcomm/qca_framing.c b/drivers/net/ethernet/qualcomm/qca_framing.c index faa924c..2341f2b 100644 --- a/drivers/net/ethernet/qualcomm/qca_framing.c +++ b/drivers/net/ethernet/qualcomm/qca_framing.c @@ -117,7 +117,7 @@ qcafrm_fsm_decode(struct qcafrm_handle *handle, u8 *buf, u16 buf_len, u8 recv_by break; case QCAFRM_WAIT_RSVD_BYTE2: len = handle->offset; - if (len > buf_len || len < QCAFRM_ETHMINLEN) { + if (len > buf_len || len < QCAFRM_MIN_LEN) { ret = QCAFRM_INVLEN; handle->state = QCAFRM_HW_LEN0; } else { diff --git a/drivers/net/ethernet/qualcomm/qca_framing.h b/drivers/net/ethernet/qualcomm/qca_framing.h index 8b385e6..5df7c65 100644 --- a/drivers/net/ethernet/qualcomm/qca_framing.h +++ b/drivers/net/ethernet/qualcomm/qca_framing.h @@ -44,12 +44,12 @@ #define QCAFRM_INVFRAME (QCAFRM_ERR_BASE - 4) /* Min/Max Ethernet MTU: 46/1500 */ -#define QCAFRM_ETHMINMTU (ETH_ZLEN - ETH_HLEN) -#define QCAFRM_ETHMAXMTU ETH_DATA_LEN +#define QCAFRM_MIN_MTU (ETH_ZLEN - ETH_HLEN) +#define QCAFRM_MAX_MTU ETH_DATA_LEN /* Min/Max frame lengths */ -#define QCAFRM_ETHMINLEN (QCAFRM_ETHMINMTU + ETH_HLEN) -#define QCAFRM_ETHMAXLEN (QCAFRM_ETHMAXMTU + VLAN_ETH_HLEN) +#define QCAFRM_MIN_LEN (QCAFRM_MIN_MTU + ETH_HLEN) +#define QCAFRM_MAX_LEN (QCAFRM_MAX_MTU + VLAN_ETH_HLEN) /* QCA7K header len */ #define QCAFRM_HEADER_LEN 8 diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c index 5c79612..a0dbb92 100644 --- a/drivers/net/ethernet/qualcomm/qca_spi.c +++ b/drivers/net/ethernet/qualcomm/qca_spi.c @@ -69,7 +69,7 @@ static int qcaspi_pluggable = QCASPI_PLUGGABLE_MIN; module_param(qcaspi_pluggable, int, 0); MODULE_PARM_DESC(qcaspi_pluggable, "Pluggable SPI connection (yes/no)."); -#define QCASPI_MTU QCAFRM_ETHMAXMTU +#define QCASPI_MTU QCAFRM_MAX_MTU #define QCASPI_TX_TIMEOUT (1 * HZ) #define QCASPI_QCA7K_REBOOT_TIME_MS 1000 @@ -402,7 +402,7 @@ qcaspi_tx_ring_has_space(struct tx_ring *txr) if (txr->skb[txr->tail]) return 0; - return (txr->size + QCAFRM_ETHMAXLEN < QCASPI_HW_BUF_LEN) ? 1 : 0; + return (txr->size + QCAFRM_MAX_LEN < QCASPI_HW_BUF_LEN) ? 1 : 0; } /* Flush the tx ring. This function is only safe to @@ -666,8 +666,8 @@ qcaspi_netdev_xmit(struct sk_buff *skb, struct net_device *dev) struct sk_buff *tskb; u8 pad_len = 0; - if (skb->len < QCAFRM_ETHMINLEN) - pad_len = QCAFRM_ETHMINLEN - skb->len; + if (skb->len < QCAFRM_MIN_LEN) + pad_len = QCAFRM_MIN_LEN - skb->len; if (qca->txr.skb[qca->txr.tail]) { netdev_warn(qca->net_dev, "queue was unexpectedly full!\n"); @@ -804,8 +804,8 @@ qcaspi_netdev_setup(struct net_device *dev) dev->tx_queue_len = 100; /* MTU range: 46 - 1500 */ - dev->min_mtu = QCAFRM_ETHMINMTU; - dev->max_mtu = QCAFRM_ETHMAXMTU; + dev->min_mtu = QCAFRM_MIN_MTU; + dev->max_mtu = QCAFRM_MAX_MTU; qca = netdev_priv(dev); memset(qca, 0, sizeof(struct qcaspi));