From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f176.google.com (mail-wr0-f176.google.com [209.85.128.176]) by dpdk.org (Postfix) with ESMTP id 4DA13206 for ; Wed, 30 Aug 2017 16:47:29 +0200 (CEST) Received: by mail-wr0-f176.google.com with SMTP id z91so19193148wrc.1 for ; Wed, 30 Aug 2017 07:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IHkReLLfh2BGV7vZRk9yO/RcBHLFQ/Rgi2V0LP4EakE=; b=kmns0RHK/5x6nZnJlbqofr4z6QnHyZh9DJ8+lyBTwNkQTvCGYhEK0KLWDkrca1fjE/ wD6p6t2hBG5Ls1fgRCg0dtOaklMP2zx8IwzNpt0TkXgxGCY4EYzyECZYZvVwwLoi4O4F Cla/h39heTFCohUU03qtgu9JLO9zTUElcetZmYkPdakD9JYNpwMX7KeBTiXZU5rKEhd3 2TqROMqyqp1mpb//fCGjfDZX5Icbcit0qSzpztJAoTWZtifF31PrDOq3RQf27eyhcKk+ F7Et2QIwn0gAIjgjFeNBNCqTS1ruI4VlnQ/leRcso6Fcb8vf4vKa2LNiK1A0O0r4Phha Nw6g== 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; bh=IHkReLLfh2BGV7vZRk9yO/RcBHLFQ/Rgi2V0LP4EakE=; b=pLFL3hdtUlwBt6jkE3VvAL47FiRLkKSTRX5zVnKrj879FUh38yZJ6ExGmxBD3Tr+Y+ RME/XTdyN7vw7M3Mf+EKJJI4AFP7Te69sVh2NTa3iVnd+ShyKO8ImXwGoA89CvMaxAzU uGrN6xu6NYGlg1IYfVYX2Xdzz/vugKiCkFVmCrCumt8lQIZVHDYi+RMeR9Ig6dpxYJCe zix6EcvhKGGAk282JGI5MVqceWw1u10Qk/PjI6uNCGborrp8LE9ULjeY+MYMVpEW+G04 9fWqh0BV63+jLbg8q6Sw009eY7X9eVU0HK+0/ZJXOBPn0t4TCfOlsVrDPX9pYGIAhJ3n 6FdQ== X-Gm-Message-State: AHYfb5hujvYuFVIFvHJWKjHgJIuuFiC55tmGOF49pGFPveWHhivPqL1c 8Yl2Oe0SK+n3kuSn X-Received: by 10.223.161.134 with SMTP id u6mr1399415wru.129.1504104448925; Wed, 30 Aug 2017 07:47:28 -0700 (PDT) Received: from ping.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 201sm1912338wmm.39.2017.08.30.07.47.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Aug 2017 07:47:28 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Ferruh Yigit Cc: gowrishankar.m@linux.vnet.ibm.com, stable@dpdk.org Date: Wed, 30 Aug 2017 16:47:06 +0200 Message-Id: <7b005e17d5b2a1221e6d7237e3d36fea57a33c6a.1504104367.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <20f8cf112084a36f203b80e212a9f08463bd3c91.1504020810.git.nelio.laranjeiro@6wind.com> References: <20f8cf112084a36f203b80e212a9f08463bd3c91.1504020810.git.nelio.laranjeiro@6wind.com> Subject: [dpdk-stable] [PATCH v2 1/2] net/mlx5: fix clang compilation 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: Wed, 30 Aug 2017 14:47:29 -0000 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") Cc: gowrishankar.m@linux.vnet.ibm.com Cc: stable@dpdk.org 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 57f6237..0d2dae4 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -804,12 +805,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; @@ -822,23 +822,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; @@ -874,7 +874,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.1.4