From patchwork Tue May 23 13:12:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 765953 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 3wXGHY1fglz9sPF for ; Tue, 23 May 2017 23:15:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967609AbdEWNPe (ORCPT ); Tue, 23 May 2017 09:15:34 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:63388 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967543AbdEWNOx (ORCPT ); Tue, 23 May 2017 09:14:53 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.44.37]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M5Ozn-1eATD72KND-00zYT9; Tue, 23 May 2017 15:13:18 +0200 From: Stefan Wahren To: Rob Herring , Mark Rutland , "David S. Miller" Cc: Greg Kroah-Hartman , Jiri Slaby , Lino Sanfilippo , Jakub Kicinski , devicetree@vger.kernel.org, netdev@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Wahren Subject: [PATCH v6 net-next 06/17] net: qualcomm: Improve readability of length defines Date: Tue, 23 May 2017 15:12:42 +0200 Message-Id: <1495545173-22150-7-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1495545173-22150-1-git-send-email-stefan.wahren@i2se.com> References: <1495545173-22150-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:jH8IzLS0FstVA6Evzr2VM1ziD6XuU6V3+dND5tiC0VjJ6VV68Eu z1aHfmyymRbv7A+oeaneGqk1t91eBLUtGe14wJWezN0juy6pmcx90pPez8fAK3L9ZpN1pZy ZgKj3Rm5TWxZvBFFqwSFOBLSOhaX05YbcYNjHjH/R5CGzXrqJfLwAJTuDSUtl4MTQiHp5I5 v3n9cNsVQONmgCeIh1fCg== X-UI-Out-Filterresults: notjunk:1; V01:K0:uM8cf4XOrlU=:LMyI8XoxkUIeVCZC3m1qWZ NcBhcIgJSAYNmohVpXxxcOi1UoHh3SxPWlIbPixGKaly8Hi550oUYPhjVCBmNUrCrM1gB35uY Ga8amrIl8d9PAQoLNu2xDCUaZPUI2MWW3RCvcn/IfZZqbiwvExwiU/e8pwntLIKAj+2DnKfSS GBaXOqB17q0cyl8trV0kanvANqfuPFVVxNQjldG1cfN6/km9dpmLLZ0gzzi2xNusyBnl8yEXu fQ3xxg9zAW3aQzCgqLxHQYmoWrMv9gF9GmrYKj8Dhqs+GnMSnI0cybTsxCRjpKFCodA/DN6k0 i106DOBpPJDT9gHjAcXAE6xqjNqqYP1gLAkKTaqehADSsR5tpr8sWtN/bPo6fZY6bEAbYbZYE M0/HxtS/jrGQAUdMmHQzSE02RrF+Nd11umr0VhDb2PE46ITGaxUdanqr6ccbIYyVYN0kKhEuQ yiT2gplXqB5r9/zLgSvjg16HI0dZdAQ2lQ0wKvjcIE3DGSy7bIWMNU4Bk24Ghoc2bN9JJiuL+ UUdEbsWuOkrhMUZUIqFT5RBkV8trioR83F5XLOJAJ9C4AaKFUq3exQPjmi4gVkRbgStmy8Sm6 Aah6OTZ3z/KZ5uresO6i6i1qB+jHwMKAxM8QmhuSHilW+huMHZw+5lshNfDYRBvgfJu0gngD+ 3IlZeRDNOuPNV2lI5IQa9xd3CbINzLeyYaLTwpaV+tLcCqwnhliSYItgePADWRbL7ArM= 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 7e039e3..f155548 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 @@ -403,7 +403,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 @@ -667,8 +667,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"); @@ -805,8 +805,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));