From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by dpdk.org (Postfix) with ESMTP id 8DF971B7A9 for ; Tue, 15 May 2018 15:48:06 +0200 (CEST) Received: by mail-wm0-f68.google.com with SMTP id j5-v6so1227949wme.5 for ; Tue, 15 May 2018 06:48:06 -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=fYLgVxmf5G8BtbXV+heZMAz+gtUrHRd71jmgV47Z7Go=; b=i0p+6N19cBW6jcFm0JlGZ5s4YYK/BPOnsH06UzJ8wK6NaB4K6lPeC3YO3PnRv4o8I5 +BCvYFS36S0nbiQRMzXtMaPYl6jNUmdCPVpaKZ6AJtDk5ys0kwvFTYZS081Fo/XEUFgn rzA350gx0zbnOSqqHxN1B1tw8CnRy7/UKwDd7lSCDzX7B6lMVqYnC2NJ9aXEZInTafcn Ac9mzZ4WkT36LVRHskZMdjEVpi8SBtPZWY2jPhLRUr609axs3ScC/aNW1ebcmKaiU4W/ ylFQHaMm8SXZnrff7fqwN5pgHAXkE4+5JY/OVFml4Fw5WxiW4RnKlJxIDGvNcDaZxAPV dQ+Q== 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=fYLgVxmf5G8BtbXV+heZMAz+gtUrHRd71jmgV47Z7Go=; b=ePDCnWGXNjmgO9BtF1nFYIIA2INtByfkPxKkDqyrwiDAxKeLcWEM0GS082M9zS8qFq ll5Clwc9e9dsGSku5DS0sEPNEIeK3g7Wv7FpkM2gsVeBQz3jNPdNXh23yopguWVbX4KG rdwwRQqmcGMTZdSTywjswEX7TLZtfwVaFFLdz1hqjbtGMuAMCVmawST4O9ozrhFKmMgt Q72olWJLT3gPtrFPmZaWIQNXirFU7MCtpK3jeeu7YBEo2OydzOKjDz/ayqmhUQHBCLhH pqVdJMzHBRLL0mvf2Hk1JbFTLpbEg5BUh8X9CKVpw8JzVgHSJJ+EGfq4EBphRItewCdB BVHQ== X-Gm-Message-State: ALKqPwcZSntLp5BdTyEAMLi0mlOO0O8G0Syu+jyUTgDiSa1sPPKo1ZND 1qXWO4II+bp8splWzBGyoWjkMkaR X-Google-Smtp-Source: AB8JxZo2H4E9qBJTqgVIAJoWaCW2EGex0ArG+hzuiQC5GdGNaMkqTSECZc1MlB9PP+iWgewMgrGgkA== X-Received: by 2002:a1c:dc54:: with SMTP id t81-v6mr8879091wmg.90.1526392086275; Tue, 15 May 2018 06:48:06 -0700 (PDT) Received: from localhost (slip139-92-244-193.lon.uk.prserv.net. [139.92.244.193]) by smtp.gmail.com with ESMTPSA id h5-v6sm131219wrm.37.2018.05.15.06.48.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 May 2018 06:48:05 -0700 (PDT) From: luca.boccassi@gmail.com To: Andy Green Cc: Stephen Hemminger , dpdk stable Date: Tue, 15 May 2018 14:46:25 +0100 Message-Id: <20180515134731.9337-14-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180515134731.9337-1-luca.boccassi@gmail.com> References: <20180503110612.12146-2-luca.boccassi@gmail.com> <20180515134731.9337-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net: move stack variable at top of VLAN strip function' has been queued to stable release 18.02.2 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 13:48:06 -0000 Hi, FYI, your patch has been queued to stable release 18.02.2 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 fe810530d32e0a1cdc6fae7fca3310e36e12a712 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 45daa911a..16dddb388 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -324,11 +324,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_RX_VLAN_STRIPPED; m->vlan_tci = rte_be_to_cpu_16(vh->vlan_tci); -- 2.14.2