From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id B422A239 for ; Tue, 21 Nov 2017 14:20:47 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 681B220BA6; Tue, 21 Nov 2017 08:20:47 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:20:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=sQBM+8FiJOqiIp4Uw xCXit8t+6lF9hfiUyWm28emx/M=; b=eOTqPl/viCsEFsqylMxScr0CSaVpkoRza 1sjl7RyaDT8o46MLtEn9XmQwktQmdHAydSite6ODVhfrBWr5pPRyLV7i/cSlqW/v b6eekCED83ybyekE+cd/niD6K5U7UIMkLh4U4yKhnA8lTlSEyIEA1AD11R0/naGn pmqUK5QUS0QL5rutW8NOwhTRBkDDyuUVHq68OvcOCtclNvDPksJPx5HYCd+vxFs6 jLWq2Gn7D/CCNxrnoJ0liL6mC24cr7wXEa22tGPIBIOa1ZOrlvj5gyZiOTTV5TdZ R19rkdUiWNROXy0NV67WCBlDdp3p4tugWWhd49cfHPNWiahqMR19w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=sQBM+8FiJOqiIp4UwxCXit8t+6lF9hfiUyWm28emx/M=; b=XkVFno84 3dm6yGBsu6BzcESHkhIGlYl3sq19M8fkyWmXXdgpih1Q/H+8oE6jEyQJqtyEX/EB fKEzT1Dw8zKl3AC+muPUO2xs04ZkxtXzafACTg7xhYwV+NX0ea5JDRL9AnANKR6V y2pcUwq/wwX/L1tAwOmofpb5JvS0hq9Cpxztxl0gHtPWZdktUhst0bQsiniYUOxR w68PCjiteD8u/Zby3XzziWPFvSutU3S6RLdV+uBexEc7M92Q8TrWOzOYMv96fZsU eS0oBZZjVeevKSVprgVrP73x8Puw50ab+wqcK1dVl0Pp9PqTHQUBJHB8Qs0GJb2Y tMIR1LqX1yaLJA== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id E5A6524631; Tue, 21 Nov 2017 08:20:44 -0500 (EST) From: Yuanhan Liu To: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= Cc: Adrien Mazarguil , dpdk stable Date: Tue, 21 Nov 2017 21:16:05 +0800 Message-Id: <1511270333-31002-23-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/mlx5: fix clang build' has been queued to stable release 17.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 13:20:48 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From b3ef7ae1ee06e0145ff031243d29a0470f099a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= Date: Wed, 30 Aug 2017 16:47:06 +0200 Subject: [PATCH] net/mlx5: fix clang build [ upstream commit 90260d577b61685365b7cf1a6151b9ed6b108f2d ] On redhat 7.2 clang reports the following error: CC mlx5_rxmode.o /drivers/net/mlx5/mlx5_ethdev.c:820:32: error: field 'edata' with variable sized type 'struct ethtool_link_settings' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end] struct ethtool_link_settings edata; Use alternative approach to reserve buffer space on the stack. Fixes: ef09a7fc7620 ("net/mlx5: fix inconsistent link status query") Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_ethdev.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index b0eb3cd..9a10f6a 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -49,6 +49,7 @@ #include #include #include +#include /* DPDK headers don't like -pedantic. */ #ifdef PEDANTIC @@ -816,12 +817,11 @@ static int mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) { struct priv *priv = mlx5_get_priv(dev); - __extension__ struct { - struct ethtool_link_settings edata; - uint32_t link_mode_data[3 * - ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32]; - } ecmd; - + alignas(struct ethtool_link_settings) + uint8_t data[offsetof(struct ethtool_link_settings, link_mode_masks) + + sizeof(uint32_t) * + ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32 * 3]; + struct ethtool_link_settings *ecmd = (void *)data; struct ifreq ifr; struct rte_eth_link dev_link; uint64_t sc; @@ -834,23 +834,23 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) memset(&dev_link, 0, sizeof(dev_link)); dev_link.link_status = ((ifr.ifr_flags & IFF_UP) && (ifr.ifr_flags & IFF_RUNNING)); - memset(&ecmd, 0, sizeof(ecmd)); - ecmd.edata.cmd = ETHTOOL_GLINKSETTINGS; - ifr.ifr_data = (void *)&ecmd; + memset(ecmd, 0, sizeof(*ecmd)); + ecmd->cmd = ETHTOOL_GLINKSETTINGS; + ifr.ifr_data = (void *)ecmd; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); return -1; } - ecmd.edata.link_mode_masks_nwords = -ecmd.edata.link_mode_masks_nwords; + ecmd->link_mode_masks_nwords = -ecmd->link_mode_masks_nwords; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); return -1; } - dev_link.link_speed = ecmd.edata.speed; - sc = ecmd.edata.link_mode_masks[0] | - ((uint64_t)ecmd.edata.link_mode_masks[1] << 32); + dev_link.link_speed = ecmd->speed; + sc = ecmd->link_mode_masks[0] | + ((uint64_t)ecmd->link_mode_masks[1] << 32); priv->link_speed_capa = 0; if (sc & ETHTOOL_LINK_MODE_Autoneg_BIT) priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG; @@ -886,7 +886,7 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT | ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT)) priv->link_speed_capa |= ETH_LINK_SPEED_100G; - dev_link.link_duplex = ((ecmd.edata.duplex == DUPLEX_HALF) ? + dev_link.link_duplex = ((ecmd->duplex == DUPLEX_HALF) ? ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX); dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED); -- 2.7.4