From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 8EFF81B252 for ; Mon, 30 Oct 2017 16:36:03 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id y80so9880936wmd.0 for ; Mon, 30 Oct 2017 08:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PL4gfwMPi2rA/LdpLirvBIViDT0fb300xKQ0N9MRiA4=; b=XPJ6yMIdgL92Cbm0VdIQtz1Gkq75a8AptNrOcM6xAxXX04XBatKSo0aAlVc9wupt3S pfa7QoPsvT77ZIhbrYX+HzQCgWXm0qzezgMXVtWpXFsHdu84SHI3h0hdQjeGhV0alVL7 dyzyfJ5YK46ivF2RYaMw6+q+0BDJ1KB/k2qPEXYtzrW5mrohOGatK7Dv0vpCJrOjnk0D oFPu7maUvd7S3ARczU1IVWpDyMQsVzzwlGL51HUw56Ul+5e0W+eAHcGvjlLZsfRzc2ZG MG1743mQYcKpCiIfL2B+HeypSykrDHNxf/+yjNDvs/JyJN/08uqaObDANigDSPxL7zKH /2yg== 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=PL4gfwMPi2rA/LdpLirvBIViDT0fb300xKQ0N9MRiA4=; b=C+cdCynp6AkO4w063w9iFjJfQPYYLQabKbUKglxNfKPDffNkGVihLzlwXcdbzFMb1o DQvl1qFpab8EmulrgtiJDp7X75w/hSjApRmQ9iS+wt8KyKbB1N6Zy7KOlRy8eoTou0d1 LKxJyZ4aHHPbmskQNyM0ArRxHPCBSikQXVvE9UZdBGVZE3IbqAZ9Ts3PAxb0VmcMgVW5 RLa9Bc8cyiuzHabLmzjNvacjbXrFAq74UGHVI6cl2Odelx8jCHpnBpQflJGhbIrL6l++ 6oDgnjz2+CkwUFgYFTrr39Q8XglQq53rg3PFP5VUfiZf9hkzsKheeJTOSRyBf4PZFxEr jhaQ== X-Gm-Message-State: AMCzsaUSYakrMtN/IJNM4zhIZ06G5VGuJTUZaHoWmlaLaRF5Y7NAEbzn 6z43iYk0QiOXLIKOZCPHynA= X-Google-Smtp-Source: ABhQp+REi9anRVKw5B7Y1nRZR4SVJk/T8JYbmN0gl93wDyfzKRPWtD0ax1rN3WuZRV4r9RLoWLsB4A== X-Received: by 10.28.150.194 with SMTP id y185mr3801641wmd.54.1509377763214; Mon, 30 Oct 2017 08:36:03 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id x49sm10796992wrb.25.2017.10.30.08.36.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2017 08:36:02 -0700 (PDT) From: luca.boccassi@gmail.com To: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= Cc: Adrien Mazarguil , dpdk stable Date: Mon, 30 Oct 2017 15:34:13 +0000 Message-Id: <20171030153511.13322-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171030153511.13322-1-luca.boccassi@gmail.com> References: <20171030153511.13322-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/mlx5: fix clang build' has been queued to LTS release 16.11.4 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: Mon, 30 Oct 2017 15:36:03 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.4 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/01/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From 116a7777f30dee8b999045d0a1d4680004793ccd 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 ca981a531..5384a880a 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 @@ -755,12 +756,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; @@ -773,23 +773,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; @@ -825,7 +825,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.11.0