From fd52b477818e3844f62f3d43d2c321af39c3f287 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 7 Feb 2013 14:07:47 +0100 Subject: [PATCH] kni: fix build with 802.1p kernel support C90 compilers forbid mixed declaration and code. Signed-off-by: Thomas Monjalon Acked-by: Adrien Mazarguil --- lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 */ -- 2.20.1