From patchwork Mon May 29 11:57:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 768147 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 3wbwHD4sdWz9s0m for ; Mon, 29 May 2017 21:58:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751184AbdE2L5z (ORCPT ); Mon, 29 May 2017 07:57:55 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:51325 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750988AbdE2L5u (ORCPT ); Mon, 29 May 2017 07:57:50 -0400 Received: from duckbill-v2-sdk.fritz.box ([109.104.48.59]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MNyAB-1dILZc2nQR-007RGY; Mon, 29 May 2017 13:57:35 +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 v8 net-next 06/17] net: qualcomm: Improve readability of length defines Date: Mon, 29 May 2017 13:57:14 +0200 Message-Id: <1496059045-13572-7-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1496059045-13572-1-git-send-email-stefan.wahren@i2se.com> References: <1496059045-13572-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:gqiBZUTxXYGUe35BrPz/9R5doqUoEziX1GCqqIea7uKB8XKM5+c 8fQW9v4MVI1zb/LL1a3U7ZUlbJvtbDhWMj+bLeO1FQB3mrbd9LUVQCKQ0INNRM73wqKrKs1 woetwbIfTnZWKL4Ty2hGDhrN7O+JlWuM6IOjOYeI8AmHT0JTf33JAdznYqZdZScPJ3/OIJP wC9wLexvHY7VWSLIBCEfA== X-UI-Out-Filterresults: notjunk:1; V01:K0:dhOaiMSCthk=:Xr8kijoVBci+wqy66ivQVX yMGeCjnMB1zp/eUgzgQtGwT8Xq/ORbKdn+FxYIo/TdgsdVwPOJKWlgb2RafP56+ccP5Q3z2FZ /4l49bHDMfRWeBpGrwDDz/9EkvLU3F0EeQ9plWZytsstFphTEy7vvay1EQp+Uvc6lLKzhkMd0 YdAnFihVvIOG9nSAe1GwvT+uvPyfHU+6mNymOLvViI4dRdgxGK9zqSu+TJ4yBQjJ+y3GdAbaT 2TVJUNhFHZhzFRW9TI4K7Laq65JCW2afwtbNz40rFCITKTd/04Ks0rj84hG6WI9/3HY11W7+0 JWnBeKzjaCt8E/db/WwaT8jO/NEN+23aC6ACDfmIEZ9lxTmNzNpCjS2MzNOhqiIDrGsFrsUlf SprGhJZUXNcfJ1lklPeho0D6rOyjoBgTipC2PRbPlYkwftAnb7FAlZ9sx38gO/jAm2+cpYwFj 1oqGcUnadW5pXAR2AYZRg8omUROuHYVhDdUaohclMlhMVfAOF1yKVCprKO+yOMECWDare0jaT up5xwqVmDHILfEGQQ+fPbDWPLBbxpVe5LiU8veBjW1xAimL74nxo1+haG3l5f5Jphp2NM7ixE UPAKYzHWlL270hgTJ0iW5CluWLlMuRK3jCsMetuMx1C1gbkZP7xtoFBxa+eDKyFpIGh/cezmG AGyGKMHEPWRLsK/7mEkMFoUrMC6Umjz22pqSr0rQOjwR/XyHpeSwFnTqEU0QjozScfjY= 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));