intel: Move the Intel wired LAN drivers

Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
the necessary Kconfig and Makefile changes.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

10 files changed, 0 insertions, 5083 deletions

diff --git a/drivers/net/igbvf/Makefile b/drivers/net/igbvf/Makefile
deleted file mode 100644
index 0fa3db3dd8b6..000000000000
--- a/drivers/net/igbvf/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-################################################################################
-#
-# Intel(R) 82576 Virtual Function Linux driver
-# Copyright(c) 2009 - 2010 Intel Corporation.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms and conditions of the GNU General Public License,
-# version 2, as published by the Free Software Foundation.
-#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 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".
-#
-# Contact Information:
-# e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-# Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-#
-################################################################################
-
-#
-# Makefile for the Intel(R) 82576 VF ethernet driver
-#
-
-obj-$(CONFIG_IGBVF) += igbvf.o
-
-igbvf-objs := vf.o \
-              mbx.o \
-              ethtool.o \
-              netdev.o
-
diff --git a/drivers/net/igbvf/defines.h b/drivers/net/igbvf/defines.h
deleted file mode 100644
index 79f2604673fe..000000000000
--- a/drivers/net/igbvf/defines.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  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".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-#ifndef _E1000_DEFINES_H_
-#define _E1000_DEFINES_H_
-
-/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-#define REQ_TX_DESCRIPTOR_MULTIPLE  8
-#define REQ_RX_DESCRIPTOR_MULTIPLE  8
-
-/* IVAR valid bit */
-#define E1000_IVAR_VALID        0x80
-
-/* Receive Descriptor bit definitions */
-#define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
-#define E1000_RXD_STAT_EOP      0x02    /* End of Packet */
-#define E1000_RXD_STAT_IXSM     0x04    /* Ignore checksum */
-#define E1000_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
-#define E1000_RXD_STAT_UDPCS    0x10    /* UDP xsum calculated */
-#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */
-#define E1000_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
-#define E1000_RXD_ERR_SE        0x02    /* Symbol Error */
-#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
-
-#define E1000_RXDEXT_STATERR_CE    0x01000000
-#define E1000_RXDEXT_STATERR_SE    0x02000000
-#define E1000_RXDEXT_STATERR_SEQ   0x04000000
-#define E1000_RXDEXT_STATERR_CXE   0x10000000
-#define E1000_RXDEXT_STATERR_TCPE  0x20000000
-#define E1000_RXDEXT_STATERR_IPE   0x40000000
-#define E1000_RXDEXT_STATERR_RXE   0x80000000
-
-
-/* Same mask, but for extended and packet split descriptors */
-#define E1000_RXDEXT_ERR_FRAME_ERR_MASK ( \
-    E1000_RXDEXT_STATERR_CE  |            \
-    E1000_RXDEXT_STATERR_SE  |            \
-    E1000_RXDEXT_STATERR_SEQ |            \
-    E1000_RXDEXT_STATERR_CXE |            \
-    E1000_RXDEXT_STATERR_RXE)
-
-/* Device Control */
-#define E1000_CTRL_RST      0x04000000  /* Global reset */
-
-/* Device Status */
-#define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */
-#define E1000_STATUS_LU         0x00000002      /* Link up.0=no,1=link */
-#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
-#define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */
-#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
-#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
-
-#define SPEED_10    10
-#define SPEED_100   100
-#define SPEED_1000  1000
-#define HALF_DUPLEX 1
-#define FULL_DUPLEX 2
-
-/* Transmit Descriptor bit definitions */
-#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-
-#define MAX_JUMBO_FRAME_SIZE    0x3F00
-
-/* 802.1q VLAN Packet Size */
-#define VLAN_TAG_SIZE              4    /* 802.3ac tag (not DMA'd) */
-
-/* Error Codes */
-#define E1000_SUCCESS      0
-#define E1000_ERR_CONFIG   3
-#define E1000_ERR_MAC_INIT 5
-#define E1000_ERR_MBX      15
-
-#ifndef ETH_ADDR_LEN
-#define ETH_ADDR_LEN                 6
-#endif
-
-/* SRRCTL bit definitions */
-#define E1000_SRRCTL_BSIZEPKT_SHIFT                     10 /* Shift _right_ */
-#define E1000_SRRCTL_BSIZEHDRSIZE_MASK                  0x00000F00
-#define E1000_SRRCTL_BSIZEHDRSIZE_SHIFT                 2  /* Shift _left_ */
-#define E1000_SRRCTL_DESCTYPE_ADV_ONEBUF                0x02000000
-#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS          0x0A000000
-#define E1000_SRRCTL_DESCTYPE_MASK                      0x0E000000
-#define E1000_SRRCTL_DROP_EN                            0x80000000
-
-#define E1000_SRRCTL_BSIZEPKT_MASK      0x0000007F
-#define E1000_SRRCTL_BSIZEHDR_MASK      0x00003F00
-
-/* Additional Descriptor Control definitions */
-#define E1000_TXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Tx Queue */
-#define E1000_RXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Rx Queue */
-
-/* Direct Cache Access (DCA) definitions */
-#define E1000_DCA_TXCTRL_TX_WB_RO_EN (1 << 11) /* Tx Desc writeback RO bit */
-
-#define E1000_VF_INIT_TIMEOUT 200 /* Number of retries to clear RSTI */
-
-#endif /* _E1000_DEFINES_H_ */
diff --git a/drivers/net/igbvf/ethtool.c b/drivers/net/igbvf/ethtool.c
deleted file mode 100644
index b0b14d63dfbf..000000000000
--- a/drivers/net/igbvf/ethtool.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  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".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-/* ethtool support for igbvf */
-
-#include <linux/netdevice.h>
-#include <linux/ethtool.h>
-#include <linux/pci.h>
-#include <linux/vmalloc.h>
-#include <linux/delay.h>
-
-#include "igbvf.h"
-#include <linux/if_vlan.h>
-
-
-struct igbvf_stats {
-	char stat_string[ETH_GSTRING_LEN];
-	int sizeof_stat;
-	int stat_offset;
-	int base_stat_offset;
-};
-
-#define IGBVF_STAT(current, base) \
-		sizeof(((struct igbvf_adapter *)0)->current), \
-		offsetof(struct igbvf_adapter, current), \
-		offsetof(struct igbvf_adapter, base)
-
-static const struct igbvf_stats igbvf_gstrings_stats[] = {
-	{ "rx_packets", IGBVF_STAT(stats.gprc, stats.base_gprc) },
-	{ "tx_packets", IGBVF_STAT(stats.gptc, stats.base_gptc) },
-	{ "rx_bytes", IGBVF_STAT(stats.gorc, stats.base_gorc) },
-	{ "tx_bytes", IGBVF_STAT(stats.gotc, stats.base_gotc) },
-	{ "multicast", IGBVF_STAT(stats.mprc, stats.base_mprc) },
-	{ "lbrx_bytes", IGBVF_STAT(stats.gorlbc, stats.base_gorlbc) },
-	{ "lbrx_packets", IGBVF_STAT(stats.gprlbc, stats.base_gprlbc) },
-	{ "tx_restart_queue", IGBVF_STAT(restart_queue, zero_base) },
-	{ "rx_long_byte_count", IGBVF_STAT(stats.gorc, stats.base_gorc) },
-	{ "rx_csum_offload_good", IGBVF_STAT(hw_csum_good, zero_base) },
-	{ "rx_csum_offload_errors", IGBVF_STAT(hw_csum_err, zero_base) },
-	{ "rx_header_split", IGBVF_STAT(rx_hdr_split, zero_base) },
-	{ "alloc_rx_buff_failed", IGBVF_STAT(alloc_rx_buff_failed, zero_base) },
-};
-
-#define IGBVF_GLOBAL_STATS_LEN ARRAY_SIZE(igbvf_gstrings_stats)
-
-static const char igbvf_gstrings_test[][ETH_GSTRING_LEN] = {
-	"Link test   (on/offline)"
-};
-
-#define IGBVF_TEST_LEN ARRAY_SIZE(igbvf_gstrings_test)
-
-static int igbvf_get_settings(struct net_device *netdev,
-                              struct ethtool_cmd *ecmd)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	struct e1000_hw *hw = &adapter->hw;
-	u32 status;
-
-	ecmd->supported   = SUPPORTED_1000baseT_Full;
-
-	ecmd->advertising = ADVERTISED_1000baseT_Full;
-
-	ecmd->port = -1;
-	ecmd->transceiver = XCVR_DUMMY1;
-
-	status = er32(STATUS);
-	if (status & E1000_STATUS_LU) {
-		if (status & E1000_STATUS_SPEED_1000)
-			ethtool_cmd_speed_set(ecmd, SPEED_1000);
-		else if (status & E1000_STATUS_SPEED_100)
-			ethtool_cmd_speed_set(ecmd, SPEED_100);
-		else
-			ethtool_cmd_speed_set(ecmd, SPEED_10);
-
-		if (status & E1000_STATUS_FD)
-			ecmd->duplex = DUPLEX_FULL;
-		else
-			ecmd->duplex = DUPLEX_HALF;
-	} else {
-		ethtool_cmd_speed_set(ecmd, -1);
-		ecmd->duplex = -1;
-	}
-
-	ecmd->autoneg = AUTONEG_DISABLE;
-
-	return 0;
-}
-
-static int igbvf_set_settings(struct net_device *netdev,
-                              struct ethtool_cmd *ecmd)
-{
-	return -EOPNOTSUPP;
-}
-
-static void igbvf_get_pauseparam(struct net_device *netdev,
-                                 struct ethtool_pauseparam *pause)
-{
-	return;
-}
-
-static int igbvf_set_pauseparam(struct net_device *netdev,
-                                struct ethtool_pauseparam *pause)
-{
-	return -EOPNOTSUPP;
-}
-
-static u32 igbvf_get_rx_csum(struct net_device *netdev)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	return !(adapter->flags & IGBVF_FLAG_RX_CSUM_DISABLED);
-}
-
-static int igbvf_set_rx_csum(struct net_device *netdev, u32 data)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-	if (data)
-		adapter->flags &= ~IGBVF_FLAG_RX_CSUM_DISABLED;
-	else
-		adapter->flags |= IGBVF_FLAG_RX_CSUM_DISABLED;
-
-	return 0;
-}
-
-static u32 igbvf_get_tx_csum(struct net_device *netdev)
-{
-	return (netdev->features & NETIF_F_IP_CSUM) != 0;
-}
-
-static int igbvf_set_tx_csum(struct net_device *netdev, u32 data)
-{
-	if (data)
-		netdev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
-	else
-		netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
-	return 0;
-}
-
-static int igbvf_set_tso(struct net_device *netdev, u32 data)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-	if (data) {
-		netdev->features |= NETIF_F_TSO;
-		netdev->features |= NETIF_F_TSO6;
-	} else {
-		netdev->features &= ~NETIF_F_TSO;
-		netdev->features &= ~NETIF_F_TSO6;
-	}
-
-	dev_info(&adapter->pdev->dev, "TSO is %s\n",
-	         data ? "Enabled" : "Disabled");
-	return 0;
-}
-
-static u32 igbvf_get_msglevel(struct net_device *netdev)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	return adapter->msg_enable;
-}
-
-static void igbvf_set_msglevel(struct net_device *netdev, u32 data)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	adapter->msg_enable = data;
-}
-
-static int igbvf_get_regs_len(struct net_device *netdev)
-{
-#define IGBVF_REGS_LEN 8
-	return IGBVF_REGS_LEN * sizeof(u32);
-}
-
-static void igbvf_get_regs(struct net_device *netdev,
-                           struct ethtool_regs *regs, void *p)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	struct e1000_hw *hw = &adapter->hw;
-	u32 *regs_buff = p;
-
-	memset(p, 0, IGBVF_REGS_LEN * sizeof(u32));
-
-	regs->version = (1 << 24) | (adapter->pdev->revision << 16) |
-			adapter->pdev->device;
-
-	regs_buff[0] = er32(CTRL);
-	regs_buff[1] = er32(STATUS);
-
-	regs_buff[2] = er32(RDLEN(0));
-	regs_buff[3] = er32(RDH(0));
-	regs_buff[4] = er32(RDT(0));
-
-	regs_buff[5] = er32(TDLEN(0));
-	regs_buff[6] = er32(TDH(0));
-	regs_buff[7] = er32(TDT(0));
-}
-
-static int igbvf_get_eeprom_len(struct net_device *netdev)
-{
-	return 0;
-}
-
-static int igbvf_get_eeprom(struct net_device *netdev,
-                            struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-	return -EOPNOTSUPP;
-}
-
-static int igbvf_set_eeprom(struct net_device *netdev,
-                            struct ethtool_eeprom *eeprom, u8 *bytes)
-{
-	return -EOPNOTSUPP;
-}
-
-static void igbvf_get_drvinfo(struct net_device *netdev,
-                              struct ethtool_drvinfo *drvinfo)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	char firmware_version[32] = "N/A";
-
-	strncpy(drvinfo->driver,  igbvf_driver_name, 32);
-	strncpy(drvinfo->version, igbvf_driver_version, 32);
-	strncpy(drvinfo->fw_version, firmware_version, 32);
-	strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-	drvinfo->regdump_len = igbvf_get_regs_len(netdev);
-	drvinfo->eedump_len = igbvf_get_eeprom_len(netdev);
-}
-
-static void igbvf_get_ringparam(struct net_device *netdev,
-                                struct ethtool_ringparam *ring)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	struct igbvf_ring *tx_ring = adapter->tx_ring;
-	struct igbvf_ring *rx_ring = adapter->rx_ring;
-
-	ring->rx_max_pending = IGBVF_MAX_RXD;
-	ring->tx_max_pending = IGBVF_MAX_TXD;
-	ring->rx_mini_max_pending = 0;
-	ring->rx_jumbo_max_pending = 0;
-	ring->rx_pending = rx_ring->count;
-	ring->tx_pending = tx_ring->count;
-	ring->rx_mini_pending = 0;
-	ring->rx_jumbo_pending = 0;
-}
-
-static int igbvf_set_ringparam(struct net_device *netdev,
-                               struct ethtool_ringparam *ring)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	struct igbvf_ring *temp_ring;
-	int err = 0;
-	u32 new_rx_count, new_tx_count;
-
-	if ((ring->rx_mini_pending) || (ring->rx_jumbo_pending))
-		return -EINVAL;
-
-	new_rx_count = max(ring->rx_pending, (u32)IGBVF_MIN_RXD);
-	new_rx_count = min(new_rx_count, (u32)IGBVF_MAX_RXD);
-	new_rx_count = ALIGN(new_rx_count, REQ_RX_DESCRIPTOR_MULTIPLE);
-
-	new_tx_count = max(ring->tx_pending, (u32)IGBVF_MIN_TXD);
-	new_tx_count = min(new_tx_count, (u32)IGBVF_MAX_TXD);
-	new_tx_count = ALIGN(new_tx_count, REQ_TX_DESCRIPTOR_MULTIPLE);
-
-	if ((new_tx_count == adapter->tx_ring->count) &&
-	    (new_rx_count == adapter->rx_ring->count)) {
-		/* nothing to do */
-		return 0;
-	}
-
-	while (test_and_set_bit(__IGBVF_RESETTING, &adapter->state))
-		msleep(1);
-
-	if (!netif_running(adapter->netdev)) {
-		adapter->tx_ring->count = new_tx_count;
-		adapter->rx_ring->count = new_rx_count;
-		goto clear_reset;
-	}
-
-	temp_ring = vmalloc(sizeof(struct igbvf_ring));
-	if (!temp_ring) {
-		err = -ENOMEM;
-		goto clear_reset;
-	}
-
-	igbvf_down(adapter);
-
-	/*
-	 * We can't just free everything and then setup again,
-	 * because the ISRs in MSI-X mode get passed pointers
-	 * to the tx and rx ring structs.
-	 */
-	if (new_tx_count != adapter->tx_ring->count) {
-		memcpy(temp_ring, adapter->tx_ring, sizeof(struct igbvf_ring));
-
-		temp_ring->count = new_tx_count;
-		err = igbvf_setup_tx_resources(adapter, temp_ring);
-		if (err)
-			goto err_setup;
-
-		igbvf_free_tx_resources(adapter->tx_ring);
-
-		memcpy(adapter->tx_ring, temp_ring, sizeof(struct igbvf_ring));
-	}
-
-	if (new_rx_count != adapter->rx_ring->count) {
-		memcpy(temp_ring, adapter->rx_ring, sizeof(struct igbvf_ring));
-
-		temp_ring->count = new_rx_count;
-		err = igbvf_setup_rx_resources(adapter, temp_ring);
-		if (err)
-			goto err_setup;
-
-		igbvf_free_rx_resources(adapter->rx_ring);
-
-		memcpy(adapter->rx_ring, temp_ring,sizeof(struct igbvf_ring));
-	}
-err_setup:
-	igbvf_up(adapter);
-	vfree(temp_ring);
-clear_reset:
-	clear_bit(__IGBVF_RESETTING, &adapter->state);
-	return err;
-}
-
-static int igbvf_link_test(struct igbvf_adapter *adapter, u64 *data)
-{
-	struct e1000_hw *hw = &adapter->hw;
-	*data = 0;
-
-	hw->mac.ops.check_for_link(hw);
-
-	if (!(er32(STATUS) & E1000_STATUS_LU))
-		*data = 1;
-
-	return *data;
-}
-
-static void igbvf_diag_test(struct net_device *netdev,
-                            struct ethtool_test *eth_test, u64 *data)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-	set_bit(__IGBVF_TESTING, &adapter->state);
-
-	/*
-	 * Link test performed before hardware reset so autoneg doesn't
-	 * interfere with test result
-	 */
-	if (igbvf_link_test(adapter, &data[0]))
-		eth_test->flags |= ETH_TEST_FL_FAILED;
-
-	clear_bit(__IGBVF_TESTING, &adapter->state);
-	msleep_interruptible(4 * 1000);
-}
-
-static void igbvf_get_wol(struct net_device *netdev,
-                          struct ethtool_wolinfo *wol)
-{
-	wol->supported = 0;
-	wol->wolopts = 0;
-}
-
-static int igbvf_set_wol(struct net_device *netdev,
-                         struct ethtool_wolinfo *wol)
-{
-	return -EOPNOTSUPP;
-}
-
-static int igbvf_get_coalesce(struct net_device *netdev,
-                              struct ethtool_coalesce *ec)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-
-	if (adapter->itr_setting <= 3)
-		ec->rx_coalesce_usecs = adapter->itr_setting;
-	else
-		ec->rx_coalesce_usecs = adapter->itr_setting >> 2;
-
-	return 0;
-}
-
-static int igbvf_set_coalesce(struct net_device *netdev,
-                              struct ethtool_coalesce *ec)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	struct e1000_hw *hw = &adapter->hw;
-
-	if ((ec->rx_coalesce_usecs > IGBVF_MAX_ITR_USECS) ||
-	    ((ec->rx_coalesce_usecs > 3) &&
-	     (ec->rx_coalesce_usecs < IGBVF_MIN_ITR_USECS)) ||
-	    (ec->rx_coalesce_usecs == 2))
-		return -EINVAL;
-
-	/* convert to rate of irq's per second */
-	if (ec->rx_coalesce_usecs && ec->rx_coalesce_usecs <= 3) {
-		adapter->itr = IGBVF_START_ITR;
-		adapter->itr_setting = ec->rx_coalesce_usecs;
-	} else {
-		adapter->itr = ec->rx_coalesce_usecs << 2;
-		adapter->itr_setting = adapter->itr;
-	}
-
-	writel(adapter->itr,
-	       hw->hw_addr + adapter->rx_ring[0].itr_register);
-
-	return 0;
-}
-
-static int igbvf_nway_reset(struct net_device *netdev)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	if (netif_running(netdev))
-		igbvf_reinit_locked(adapter);
-	return 0;
-}
-
-
-static void igbvf_get_ethtool_stats(struct net_device *netdev,
-                                    struct ethtool_stats *stats,
-                                    u64 *data)
-{
-	struct igbvf_adapter *adapter = netdev_priv(netdev);
-	int i;
-
-	igbvf_update_stats(adapter);
-	for (i = 0; i < IGBVF_GLOBAL_STATS_LEN; i++) {
-		char *p = (char *)adapter +
-		          igbvf_gstrings_stats[i].stat_offset;
-		char *b = (char *)adapter +
-		          igbvf_gstrings_stats[i].base_stat_offset;
-		data[i] = ((igbvf_gstrings_stats[i].sizeof_stat ==
-		            sizeof(u64)) ? (*(u64 *)p - *(u64 *)b) :
-		            (*(u32 *)p - *(u32 *)b));
-	}
-
-}
-
-static int igbvf_get_sset_count(struct net_device *dev, int stringset)
-{
-	switch(stringset) {
-	case ETH_SS_TEST:
-		return IGBVF_TEST_LEN;
-	case ETH_SS_STATS:
-		return IGBVF_GLOBAL_STATS_LEN;
-	default:
-		return -EINVAL;
-	}
-}
-
-static void igbvf_get_strings(struct net_device *netdev, u32 stringset,
-                              u8 *data)
-{
-	u8 *p = data;
-	int i;
-
-	switch (stringset) {
-	case ETH_SS_TEST:
-		memcpy(data, *igbvf_gstrings_test, sizeof(igbvf_gstrings_test));
-		break;
-	case ETH_SS_STATS:
-		for (i = 0; i < IGBVF_GLOBAL_STATS_LEN; i++) {
-			memcpy(p, igbvf_gstrings_stats[i].stat_string,
-			       ETH_GSTRING_LEN);
-			p += ETH_GSTRING_LEN;
-		}
-		break;
-	}
-}
-
-static const struct ethtool_ops igbvf_ethtool_ops = {
-	.get_settings		= igbvf_get_settings,
-	.set_settings		= igbvf_set_settings,
-	.get_drvinfo		= igbvf_get_drvinfo,
-	.get_regs_len		= igbvf_get_regs_len,
-	.get_regs		= igbvf_get_regs,
-	.get_wol		= igbvf_get_wol,
-	.set_wol		= igbvf_set_wol,
-	.get_msglevel		= igbvf_get_msglevel,
-	.set_msglevel		= igbvf_set_msglevel,
-	.nway_reset		= igbvf_nway_reset,
-	.get_link		= ethtool_op_get_link,
-	.get_eeprom_len		= igbvf_get_eeprom_len,
-	.get_eeprom		= igbvf_get_eeprom,
-	.set_eeprom		= igbvf_set_eeprom,
-	.get_ringparam		= igbvf_get_ringparam,
-	.set_ringparam		= igbvf_set_ringparam,
-	.get_pauseparam		= igbvf_get_pauseparam,
-	.set_pauseparam		= igbvf_set_pauseparam,
-	.get_rx_csum            = igbvf_get_rx_csum,
-	.set_rx_csum            = igbvf_set_rx_csum,
-	.get_tx_csum		= igbvf_get_tx_csum,
-	.set_tx_csum		= igbvf_set_tx_csum,
-	.get_sg			= ethtool_op_get_sg,
-	.set_sg			= ethtool_op_set_sg,
-	.get_tso		= ethtool_op_get_tso,
-	.set_tso		= igbvf_set_tso,
-	.self_test		= igbvf_diag_test,
-	.get_sset_count		= igbvf_get_sset_count,
-	.get_strings		= igbvf_get_strings,
-	.get_ethtool_stats	= igbvf_get_ethtool_stats,
-	.get_coalesce		= igbvf_get_coalesce,
-	.set_coalesce		= igbvf_set_coalesce,
-};
-
-void igbvf_set_ethtool_ops(struct net_device *netdev)
-{
-	/* have to "undeclare" const on this struct to remove warnings */
-	SET_ETHTOOL_OPS(netdev, (struct ethtool_ops *)&igbvf_ethtool_ops);
-}
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h
deleted file mode 100644
index fd4a7b780fdd..000000000000
--- a/drivers/net/igbvf/igbvf.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
-
-  Intel(R) 82576 Virtual Function Linux driver
-  Copyright(c) 2009 - 2010 Intel Corporation.
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  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".
-
-  Contact Information:
-  e1000-devel Mailing List <e1000-devel@lists.sourceforge.net>
-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-
-*******************************************************************************/
-
-/* Linux PRO/1000 Ethernet Driver main header file */
-
-#ifndef _IGBVF_H_
-#define _IGBVF_H_
-
-#include <linux/types.h>
-#include <linux/timer.h>
-#include <linux/io.h>
-#include <linux/netdevice.h>
-#include <linux/if_vlan.h>
-
-#include "vf.h"
-
-/* Forward declarations */
-struct igbvf_info;
-struct igbvf_adapter;
-
-/* Interrupt defines */
-#define IGBVF_START_ITR                 648 /* ~6000 ints/sec */
-
-/* Interrupt modes, as used by the IntMode parameter */
-#define IGBVF_INT_MODE_LEGACY           0
-#define IGBVF_INT_MODE_MSI              1
-#define IGBVF_INT_MODE_MSIX             2
-
-/* Tx/Rx descriptor defines */
-#define IGBVF_DEFAULT_TXD               256
-#define IGBVF_MAX_TXD                   4096
-#define IGBVF_MIN_TXD                   80
-
-#define IGBVF_DEFAULT_RXD               256
-#define IGBVF_MAX_RXD                   4096
-#define IGBVF_MIN_RXD                   80
-
-#define IGBVF_MIN_ITR_USECS             10 /* 100000 irq/sec */
-#define IGBVF_MAX_ITR_USECS             10000 /* 100    irq/sec */
-
-/* RX descriptor control thresholds.
- * PTHRESH - MAC will consider prefetch if it has fewer than this number of
- *           descriptors available in its onboard memory.
- *           Setting this to 0 disables RX descriptor prefetch.
- * HTHRESH - MAC will only prefetch if there are at least this many descriptors
- *           available in host memory.
- *           If PTHRESH is 0, this should also be 0.
- * WTHRESH - RX descriptor writeback threshold - MAC will delay writing back
- *           descriptors until either it has this many to write back, or the
- *           ITR timer expires.
- */
-#define IGBVF_RX_PTHRESH                16
-#define IGBVF_RX_HTHRESH                8
-#define IGBVF_RX_WTHRESH                1
-
-/* this is the size past which hardware will drop packets when setting LPE=0 */
-#define MAXIMUM_ETHERNET_VLAN_SIZE      1522
-
-#define IGBVF_FC_PAUSE_TIME             0x0680 /* 858 usec */
-
-/* How many Tx Descriptors do we need to call netif_wake_queue ? */
-#define IGBVF_TX_QUEUE_WAKE             32
-/* How many Rx Buffers do we bundle into one write to the hardware ? */
-#define IGBVF_RX_BUFFER_WRITE           16 /* Must be power of 2 */
-
-#define AUTO_ALL_MODES                  0
-#define IGBVF_EEPROM_APME               0x0400
-
-#define IGBVF_MNG_VLAN_NONE             (-1)
-
-/* Number of packet split data buffers (not including the header buffer) */
-#define PS_PAGE_BUFFERS                 (MAX_PS_BUFFERS - 1)
-
-enum igbvf_boards {
-	board_vf,
-	board_i350_vf,
-};
-
-struct igbvf_queue_stats {
-	u64 packets;
-	u64 bytes;
-};
-
-/*
- * wrappers around a pointer to a socket buffer,
- * so a DMA handle can be stored along with the buffer
- */
-struct igbvf_buffer {
-	dma_addr_t dma;
-	struct sk_buff *skb;
-	union {
-		/* Tx */
-		struct {
-			unsigned long time_stamp;
-			u16 length;
-			u16 next_to_watch;
-			u16 mapped_as_page;
-		};
-		/* Rx */
-		struct {
-			struct page *page;
-			u64 page_dma;
-			unsigned int page_offset;
-		};
-	};
-};
-
-union igbvf_desc {
-	union e1000_adv_rx_desc rx_desc;
-	union e1000_adv_tx_desc tx_desc;
-	struct e1000_adv_tx_context_desc tx_context_desc;
-};
-
-struct igbvf_ring {
-	struct igbvf_adapter *adapter;  /* backlink */
-	union igbvf_desc *desc;         /* pointer to ring memory  */
-	dma_addr_t dma;                 /* phys address of ring    */
-	unsigned int size;              /* length of ring in bytes */
-	unsigned int count;             /* number of desc. in ring */
-
-	u16 next_to_use;
-	u16 next_to_clean;
-
-	u16 head;
-	u16 tail;
-
-	/* array of buffer information structs */
-	struct igbvf_buffer *buffer_info;
-	struct napi_struct napi;
-
-	char name[IFNAMSIZ + 5];
-	u32 eims_value;
-	u32 itr_val;
-	u16 itr_register;
-	int set_itr;
-
-	struct sk_buff *rx_skb_top;
-
-	struct igbvf_queue_stats stats;
-};
-
-/* board specific private data structure */
-struct igbvf_adapter {
-	struct timer_list watchdog_timer;
-	struct timer_list blink_timer;
-
-	struct work_struct reset_task;
-	struct work_struct watchdog_task;
-
-	const struct igbvf_info *ei;
-
-	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
-	u32 bd_number;
-	u32 rx_buffer_len;
-	u32 polling_interval;
-	u16 mng_vlan_id;
-	u16 link_speed;
-	u16 link_duplex;
-
-	spinlock_t tx_queue_lock; /* prevent concurrent tail updates */
-
-	/* track device up/down/testing state */
-	unsigned long state;
-
-	/* Interrupt Throttle Rate */
-	u32 itr;
-	u32 itr_setting;
-	u16 tx_itr;
-	u16 rx_itr;
-
-	/*
-	 * Tx
-	 */
-	struct igbvf_ring *tx_ring /* One per active queue */
-	____cacheline_aligned_in_smp;
-
-	unsigned int restart_queue;
-	u32 txd_cmd;
-
-	u32 tx_int_delay;
-	u32 tx_abs_int_delay;
-
-	unsigned int total_tx_bytes;
-	unsigned int total_tx_packets;
-	unsigned int total_rx_bytes;
-	unsigned int total_rx_packets;
-
-	/* Tx stats */
-	u32 tx_timeout_count;
-	u32 tx_fifo_head;
-	u32 tx_head_addr;
-	u32 tx_fifo_size;
-	u32 tx_dma_failed;
-
-	/*
-	 * Rx
-	 */
-	struct igbvf_ring *rx_ring;
-
-	u32 rx_int_delay;
-	u32 rx_abs_int_delay;
-
-	/* Rx stats */
-	u64 hw_csum_err;
-	u64 hw_csum_good;
-	u64 rx_hdr_split;
-	u32 alloc_rx_buff_failed;
-	u32 rx_dma_failed;
-
-	unsigned int rx_ps_hdr_size;
-	u32 max_frame_size;
-	u32 min_frame_size;
-
-	/* OS defined structs */
-	struct net_device *netdev;
-	struct pci_dev *pdev;
-	struct net_device_stats net_stats;
-	spinlock_t stats_lock;      /* prevent concurrent stats updates */
-
-	/* structs defined in e1000_hw.h */
-	struct e1000_hw hw;
-
-	/* The VF counters don't clear on read so we have to get a base
-	 * count on driver start up and always subtract that base on
-	 * on the first update, thus the flag..
-	 */
-	struct e1000_vf_stats stats;
-	u64 zero_base;
-
-	struct igbvf_ring test_tx_ring;
-	struct igbvf_ring test_rx_ring;
-	u32 test_icr;
-
-	u32 msg_enable;
-	struct msix_entry *msix_entries;
-	int int_mode;
-	u32 eims_enable_mask;
-	u32 eims_other;
-	u32 int_counter0;
-	u32 int_counter1;
-
-	u32 eeprom_wol;
-	u32 wol;
-	u32 pba;
-
-	bool fc_autoneg;
-