From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id E4D2398 for ; Tue, 24 Jul 2018 18:08:33 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id h9-v6so4715850wro.3 for ; Tue, 24 Jul 2018 09:08:33 -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=RTn/2dnNgEyrrKpZQDf38lB44IcFO6/+cl4jtdnXXDY=; b=MKcZpFPODtrwaqsoX1b4ZToWF1e4tmwryhyzi6MGlG6/hDI7PpJDDMzcAp4IKv5I0a aanxwrh7HC42Fbt0dHAemdyBThwL5/7c9hm1ehLQNBQrevA3IBE+DQ+1GoElvNP5yb1w 3RZCA++1EvQ1ugQg9DrnpA6BrueacSqNL9u8MWBQbK7jWFg/X46qrI2LyFphtrY6m50R CCWPTDpRZEmt3XCsvAWjqlEAr5GGfjWG4uzz/bYYM8aTQ2ZL3vpQCptT02/ltoS3Nu99 r9aXjEzv6RA2pzkMf9ZQ7YFqIZwrYQQOs/Gbw0bwg2txlCwkSdotE79oH8ZVWg7mIZhy ArHg== 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=RTn/2dnNgEyrrKpZQDf38lB44IcFO6/+cl4jtdnXXDY=; b=WTpvJJcy8k79ZAkhapdQ5yqrL8tyeLVQSSVLY4mkTUygwAkk8emxlCWCJQhZOTbGGG fGXfE79BBleaaE1ACyp9iDwrFd7ekbVl+RGGqomeb9AX+t7Jo0jnlBG/Rkw8wEoBjfb1 RTSnHoYbbjWkdS7XMNYkoA1jr3gSuS0OieJ9tOE2cdxE0Yb6PdPVWf5vVRpUaOXe0fZs 9Tq9ZN6O/OsVYSi3nUZf6wk++n41i/D9Fm4ddPirSRUwWeGV68PJnw/Da9WHK67cVoEg KE7TLIC/jffNTRWChI6yg32E6Fmi0Q2LhJlXPWj93wo2jXThltamj4W4/VURvqpixIb0 FgXQ== X-Gm-Message-State: AOUpUlFwcUp7+L+Uu02ZfCVHUaVhyaS3d5kuI+wznIKC/+EmYZdL6sws GXgA/rT4mk0tPBVdIJm0jVE= X-Google-Smtp-Source: AAOMgpetel0mnixRNPigfe/WZK2fwK8UWJ4WClx+0LFV+7JoBgMRv04OZ6s2oJOIKIjPCFmHxclIWw== X-Received: by 2002:a5d:50cd:: with SMTP id f13-v6mr12810936wrt.73.1532448513702; Tue, 24 Jul 2018 09:08:33 -0700 (PDT) Received: from localhost ([2a00:23c5:be94:4600:7b12:f8a0:fd52:f87d]) by smtp.gmail.com with ESMTPSA id v1-v6sm32050313wrs.34.2018.07.24.09.08.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 09:08:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Gage Eads Cc: Olivier Matz , dpdk stable Date: Tue, 24 Jul 2018 17:07:27 +0100 Message-Id: <20180724160752.20287-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180724160752.20287-1-luca.boccassi@gmail.com> References: <20180724160752.20287-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net: rename u16 to fix shadowed declaration' has been queued to LTS release 16.11.8 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, 24 Jul 2018 16:08:34 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From e1c736f81ba27736f5faf3236dfd89550bef4a34 Mon Sep 17 00:00:00 2001 From: Gage Eads Date: Mon, 4 Jun 2018 14:40:00 -0500 Subject: [PATCH] net: rename u16 to fix shadowed declaration [ upstream commit 68248ad1b9a8a5e84611346b699dd5d4f1bbe37d ] This patch renames u16 to u16_buf. u16 as a variable name causes a shadowed declaration warning if, for example, the application also typedefs u16 (e.g. by including a header containing "typedef unsigned short u16") and the application is built with -Wshadow. Signed-off-by: Gage Eads Acked-by: Olivier Matz --- lib/librte_net/rte_ip.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h index 19d6c95c8..5234663e5 100644 --- a/lib/librte_net/rte_ip.h +++ b/lib/librte_net/rte_ip.h @@ -170,25 +170,25 @@ __rte_raw_cksum(const void *buf, size_t len, uint32_t sum) /* workaround gcc strict-aliasing warning */ uintptr_t ptr = (uintptr_t)buf; typedef uint16_t __attribute__((__may_alias__)) u16_p; - const u16_p *u16 = (const u16_p *)ptr; + const u16_p *u16_buf = (const u16_p *)ptr; - while (len >= (sizeof(*u16) * 4)) { - sum += u16[0]; - sum += u16[1]; - sum += u16[2]; - sum += u16[3]; - len -= sizeof(*u16) * 4; - u16 += 4; + while (len >= (sizeof(*u16_buf) * 4)) { + sum += u16_buf[0]; + sum += u16_buf[1]; + sum += u16_buf[2]; + sum += u16_buf[3]; + len -= sizeof(*u16_buf) * 4; + u16_buf += 4; } - while (len >= sizeof(*u16)) { - sum += *u16; - len -= sizeof(*u16); - u16 += 1; + while (len >= sizeof(*u16_buf)) { + sum += *u16_buf; + len -= sizeof(*u16_buf); + u16_buf += 1; } /* if length is in odd bytes */ if (len == 1) - sum += *((const uint8_t *)u16); + sum += *((const uint8_t *)u16_buf); return sum; } -- 2.18.0