[dpdk-dev,v3,19/24] rte_ether.h: stack vars declared at top of function
Checks
Commit Message
/projects/lagopus/src/dpdk/build/include/rte_ether.h:
In function 'rte_vlan_strip':
/projects/lagopus/src/dpdk/build/include/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);
Signed-off-by: Andy Green <andy@warmcat.com>
---
lib/librte_net/rte_ether.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Comments
12/05/2018 04:00, Andy Green:
> /projects/lagopus/src/dpdk/build/include/rte_ether.h:
> In function 'rte_vlan_strip':
> /projects/lagopus/src/dpdk/build/include/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")
Cc: stable@dpdk.org
> Signed-off-by: Andy Green <andy@warmcat.com>
Applied, thanks
@@ -350,11 +350,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);