From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by dpdk.org (Postfix) with ESMTP id BAE251B6C1 for ; Tue, 15 May 2018 19:19:50 +0200 (CEST) Received: by mail-lf0-f68.google.com with SMTP id j193-v6so1380768lfg.6 for ; Tue, 15 May 2018 10:19:50 -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=PLNHfT1MhCxssrVjEmgYUTVSj/OvzFWXgSmG9JgTOV8=; b=TrQEJnedsqk66uiFhxqEwTsFcxSAC3zXH2YLIeYONNFdhWtAmsSjSAVVI3PlvUe9DM 1S0sic8Uq84KX2LheyGCAd7TG6TdG+Kpl8bOhgt9MEeccBMle/B20/jZG0wCV9+w76Xa wE/L15toYk3GI/0r+E4i50Tw5Y1lUOD2usZ0y1qwKFcNpE10Bso4RA0DD8+QRHFhuILN 2kDyG8EIIZWeaXkSCGAyKDMskwHHLn7XScLPzb0m/ew8PJNGpJo05DYx+zenZFjLydQ5 1vIbi0knpnEwgmgQsMmXw9+dTutaBUa7Bh2VrPxoaznw6smHg2E36vquy+qibGlsNa/I T+Ug== 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=PLNHfT1MhCxssrVjEmgYUTVSj/OvzFWXgSmG9JgTOV8=; b=DKSEkef0GqwO06WEI71ThmNld5TxZ8elmUhkQB6Fl+V5RysD3bz/kNds3iX3F2W3fK HyA1MKgmBA+yA29t7L1fvRPnDr8l/60L3xw6COuD+ajvX2m37i4B87NS898fWgsoF1pH Kt09CgVRv3MIRq9zfSFUHweTwwokPVMHBUHMhCR/GkL2+fP2xB5yxknr/DcUUDx3KqxQ r8nMeSnBRbY69ZrnlGtQuNlZCzFw9Yl06IAw6VAcnW9oeOShUU2HuGhMvT96tYCxZqLU KVy+TvWxq7EPNDsoIN7Hy5uoTQmVV64jnFKXaLyBn50yU5C5tRZObF6x4eaGvFqAEx8u gjgA== X-Gm-Message-State: ALKqPwfPCeAqJXPunjBgtlKg2pX/xaqSp03/Gqb8IjzCZ3idPr2bGTDQ Wty6ey1RnQOl/SQg5m4vsBI= X-Google-Smtp-Source: AB8JxZrrEKb8Ov127PU/TKxe/2tSOlKp97ZEL1QCoj+mnbIjX7dPwrJx9osrPCAa01dCwwa78HYgaQ== X-Received: by 2002:a19:4e1c:: with SMTP id c28-v6mr12015074lfb.61.1526404790356; Tue, 15 May 2018 10:19:50 -0700 (PDT) Received: from localhost ([2a00:23c5:be9a:5200:ce4c:82c0:d567:ecbb]) by smtp.gmail.com with ESMTPSA id f22-v6sm76501ljc.50.2018.05.15.10.19.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 10:19:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Andy Green Cc: Stephen Hemminger , dpdk stable Date: Tue, 15 May 2018 18:19:06 +0100 Message-Id: <20180515171933.12882-5-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180515171933.12882-1-luca.boccassi@gmail.com> References: <20180501104509.17238-46-luca.boccassi@gmail.com> <20180515171933.12882-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net: move stack variable at top of VLAN strip function' has been queued to LTS release 16.11.7 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, 15 May 2018 17:19:50 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/16/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 46b28762e8d5824b1e31757bd88fc7cf7a403895 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Sat, 12 May 2018 10:00:17 +0800 Subject: [PATCH] net: move stack variable at top of VLAN strip function [ upstream commit 5a7e5accc695e5cf0ed840f59042dba4cbe0aae3 ] In function 'rte_vlan_strip': rte_ether.h:357:2: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] struct vlan_hdr *vh = (struct vlan_hdr *)(eh + 1); Fixes: c974021a5949 ("ether: add soft vlan encap/decap") Signed-off-by: Andy Green Reviewed-by: Stephen Hemminger --- lib/librte_net/rte_ether.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 5edf66c3f..43814f626 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -352,11 +352,12 @@ static inline int rte_vlan_strip(struct rte_mbuf *m) { struct ether_hdr *eh = rte_pktmbuf_mtod(m, struct ether_hdr *); + struct vlan_hdr *vh; if (eh->ether_type != rte_cpu_to_be_16(ETHER_TYPE_VLAN)) return -1; - struct vlan_hdr *vh = (struct vlan_hdr *)(eh + 1); + vh = (struct vlan_hdr *)(eh + 1); m->ol_flags |= PKT_RX_VLAN_PKT | PKT_RX_VLAN_STRIPPED; m->vlan_tci = rte_be_to_cpu_16(vh->vlan_tci); -- 2.14.2