summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2013-02-07 14:07:47 +0100
committerDavid Marchand <david.marchand@6wind.com>2014-02-26 11:07:28 +0100
commitfd52b477818e3844f62f3d43d2c321af39c3f287 (patch)
tree89b30ad83914e17fc483f1a997a457b3219b365f
parent27f76bdf27cb64e676cca6d3861ba8cc60269b06 (diff)
downloaddpdk-fd52b477818e3844f62f3d43d2c321af39c3f287.zip
dpdk-fd52b477818e3844f62f3d43d2c321af39c3f287.tar.gz
dpdk-fd52b477818e3844f62f3d43d2c321af39c3f287.tar.xz
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>
-rw-r--r--lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c7
1 files 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 85de817..947be44 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 */