kni: support RHEL 6.8

[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..0d82613 100644 (file)
--- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c
@@ -17,7 +17,7 @@
   51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
 
   The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
+  the file called "LICENSE.GPL".
 
   Contact Information:
   e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
@@ -59,8 +59,6 @@
 #undef CONFIG_DCA_MODULE
 
 char ixgbe_driver_name[] = "ixgbe";
-static const char ixgbe_driver_string[] =
-                             "Intel(R) 10 Gigabit PCI Express Network Driver";
 #define DRV_HW_PERF
 
 #ifndef CONFIG_IXGBE_NAPI
@@ -79,8 +77,6 @@ static const char ixgbe_driver_string[] =
 #define DRV_VERSION    __stringify(MAJ) "." __stringify(MIN) "." \
                        __stringify(BUILD) DRIVERNAPI DRV_HW_PERF FPGA VMDQ_TAG
 const char ixgbe_driver_version[] = DRV_VERSION;
-static const char ixgbe_copyright[] =
-                               "Copyright (c) 1999-2012 Intel Corporation.";
 
 /* ixgbe_pci_tbl - PCI Device ID Table
  *
@@ -314,6 +310,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 +325,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 +521,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;
@@ -2276,7 +2275,7 @@ static int ixgbe_set_mac(struct net_device *netdev, void *p)
        /* set the correct pool for the new PF MAC address in entry 0 */
        ret = ixgbe_add_mac_filter(adapter, hw->mac.addr,
                                    adapter->num_vfs);
-       return (ret > 0 ? 0 : ret);
+       return ret > 0 ? 0 : ret;
 }
 
 
@@ -2965,8 +2964,3 @@ void ewarn(struct ixgbe_hw *hw, const char *st, u32 status)
 
        netif_warn(adapter, drv, adapter->netdev,  "%s", st);
 }
-
-
-
-
-