From: Thomas Monjalon <thomas.monjalon@6wind.com>
Date: Thu, 7 Feb 2013 13:07:47 +0000 (+0100)
Subject: kni: fix build with 802.1p kernel support
X-Git-Tag: spdx-start~10928
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=fd52b477818e3844f62f3d43d2c321af39c3f287;hp=27f76bdf27cb64e676cca6d3861ba8cc60269b06;p=dpdk.git

kni: fix build with 802.1p kernel support

C90 compilers forbid mixed declaration and code.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
index 85de8179f4..947be4428e 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
@@ -314,6 +314,9 @@ void ixgbe_vlan_mode(struct net_device *netdev, u32 features)
 #endif
 {
 	struct ixgbe_adapter *adapter = netdev_priv(netdev);
+#ifdef HAVE_8021P_SUPPORT
+	bool enable;
+#endif
 #ifdef HAVE_VLAN_RX_REGISTER
 
 	//if (!test_bit(__IXGBE_DOWN, &adapter->state))
@@ -326,9 +329,9 @@ void ixgbe_vlan_mode(struct net_device *netdev, u32 features)
 #endif
 #ifdef HAVE_8021P_SUPPORT
 #ifdef HAVE_VLAN_RX_REGISTER
-	bool enable = (grp || (adapter->flags & IXGBE_FLAG_DCB_ENABLED));
+	enable = (grp || (adapter->flags & IXGBE_FLAG_DCB_ENABLED));
 #else
-	bool enable = !!(features & NETIF_F_HW_VLAN_RX);
+	enable = !!(features & NETIF_F_HW_VLAN_RX);
 #endif
 	if (enable)
 		/* enable VLAN tag insert/strip */