kni: fix build with kernel 3.14

[dpdk.git] / lib / librte_eal / linuxapp / kni / ethtool / ixgbe / ixgbe_main.c

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..cb56906 100644 (file)
--- 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 */
@@ -522,7 +525,7 @@ int ixgbe_del_mac_filter(struct ixgbe_adapter *adapter, u8* addr, u16 queue)
        if (is_zero_ether_addr(addr))
                return 0;
        for (i = 0; i < hw->mac.num_rar_entries; i++) {
-               if (!compare_ether_addr(addr, adapter->mac_table[i].addr) &&
+               if (ether_addr_equal(addr, adapter->mac_table[i].addr) &&
                    adapter->mac_table[i].queue == queue) {
                        adapter->mac_table[i].state |= IXGBE_MAC_STATE_MODIFIED;
                        adapter->mac_table[i].state &= ~IXGBE_MAC_STATE_IN_USE;