[dpdk-dev] [PATCH] kni: fix build with 802.1p kernel support
Thomas Monjalon
thomas.monjalon at 6wind.com
Fri Jul 26 11:51:15 CEST 2013
C90 compilers forbid mixed declaration and code.
Signed-off-by: Thomas Monjalon <thomas.monjalon at 6wind.com>
---
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 85de817..947be44 100755
--- 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 */
--
1.7.10.4
More information about the dev
mailing list