spelling fixes

[dpdk.git] / lib / librte_eal / linuxapp / kni / ethtool / igb / igb_main.c

diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
index a647644..0657237 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
@@ -1007,7 +1007,7 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter, bool msix)
                /* start with one vector for every rx queue */
                numvecs = adapter->num_rx_queues;
 
-               /* if tx handler is seperate add 1 for every tx queue */
+               /* if tx handler is separate add 1 for every tx queue */
                if (!(adapter->flags & IGB_FLAG_QUEUE_PAIRS))
                        numvecs += adapter->num_tx_queues;
 
@@ -2294,12 +2294,14 @@ static const struct net_device_ops igb_netdev_ops = {
 #ifdef HAVE_VLAN_RX_REGISTER
        .ndo_vlan_rx_register   = igb_vlan_mode,
 #endif
+#ifndef HAVE_RHEL6_NETDEV_OPS_EXT_FDB
 #ifdef NTF_SELF
        .ndo_fdb_add            = igb_ndo_fdb_add,
 #ifndef USE_DEFAULT_FDB_DEL_DUMP
        .ndo_fdb_del            = igb_ndo_fdb_del,
        .ndo_fdb_dump           = igb_ndo_fdb_dump,
 #endif
+#endif /* ! HAVE_RHEL6_NETDEV_OPS_EXT_FDB */
 #ifdef HAVE_BRIDGE_ATTRIBS
        .ndo_bridge_setlink     = igb_ndo_bridge_setlink,
        .ndo_bridge_getlink     = igb_ndo_bridge_getlink,
@@ -7366,7 +7368,8 @@ static inline void igb_rx_hash(struct igb_ring *ring,
                               struct sk_buff *skb)
 {
        if (netdev_ring(ring)->features & NETIF_F_RXHASH)
-               skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
+               skb_set_hash(skb, le32_to_cpu(rx_desc->wb.lower.hi_dword.rss),
+                            PKT_HASH_TYPE_L3);
 }
 
 #endif
@@ -9275,7 +9278,7 @@ int igb_del_mac_filter(struct igb_adapter *adapter, u8* addr, u16 queue)
        if (is_zero_ether_addr(addr))
                return 0;
        for (i = 0; i < hw->mac.rar_entry_count; 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 = IGB_MAC_STATE_MODIFIED;
                        memset(adapter->mac_table[i].addr, 0, ETH_ALEN);