Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream (7c440e79) · Commits · github.com / kvm-riscv / linux

drivers/net/e100.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@

		#define DRV_NAME "e100"
		#define DRV_EXT "-NAPI"
		#define DRV_VERSION "3.5.10-k4"DRV_EXT
		#define DRV_VERSION "3.5.16-k2"DRV_EXT
		#define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver"
		#define DRV_COPYRIGHT "Copyright(c) 1999-2006 Intel Corporation"
		#define PFX DRV_NAME ": "
		@@ -1759,11 +1759,10 @@ static inline void e100_start_receiver(struct nic nic, struct rx rx)
		#define RFD_BUF_LEN (sizeof(struct rfd) + VLAN_ETH_FRAME_LEN)
		static int e100_rx_alloc_skb(struct nic nic, struct rx rx)
		{
		if(!(rx->skb = dev_alloc_skb(RFD_BUF_LEN + NET_IP_ALIGN)))
		if(!(rx->skb = netdev_alloc_skb(nic->netdev, RFD_BUF_LEN + NET_IP_ALIGN)))
		return -ENOMEM;

		/* Align, init, and map the RFD. */
		rx->skb->dev = nic->netdev;
		skb_reserve(rx->skb, NET_IP_ALIGN);
		memcpy(rx->skb->data, &nic->blank_rfd, sizeof(struct rfd));
		rx->dma_addr = pci_map_single(nic->pdev, rx->skb->data,
		@@ -2139,7 +2138,7 @@ static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)

		e100_start_receiver(nic, NULL);

		if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) {
		if(!(skb = netdev_alloc_skb(nic->netdev, ETH_DATA_LEN))) {
		err = -ENOMEM;
		goto err_loopback_none;
		}
		@@ -2791,6 +2790,7 @@ static pci_ers_result_t e100_io_error_detected(struct pci_dev *pdev, pci_channel
		/* Detach; put netif into state similar to hotplug unplug. */
		netif_poll_enable(netdev);
		netif_device_detach(netdev);
		pci_disable_device(pdev);

		/* Request a slot reset. */
		return PCI_ERS_RESULT_NEED_RESET;

drivers/net/e1000/e1000.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -245,9 +245,7 @@ struct e1000_adapter {
		uint16_t mng_vlan_id;
		uint32_t bd_number;
		uint32_t rx_buffer_len;
		uint32_t part_num;
		uint32_t wol;
		uint32_t ksp3_port_a;
		uint32_t smartspeed;
		uint32_t en_mng_pt;
		uint16_t link_speed;
		@@ -342,7 +340,9 @@ struct e1000_adapter {
		boolean_t tso_force;
		#endif
		boolean_t smart_power_down; /* phy smart power down */
		boolean_t quad_port_a;
		unsigned long flags;
		uint32_t eeprom_wol;
		};

		enum e1000_state_t {

drivers/net/e1000/e1000_ethtool.c

+116 −101

Original line number	Diff line number	Diff line
		@@ -709,7 +709,6 @@ e1000_set_ringparam(struct net_device *netdev,
		}

		clear_bit(__E1000_RESETTING, &adapter->flags);

		return 0;
		err_setup_tx:
		e1000_free_all_rx_resources(adapter);
		@@ -894,16 +893,17 @@ e1000_intr_test(struct e1000_adapter adapter, uint64_t data)

		*data = 0;

		/* NOTE: we don't test MSI interrupts here, yet */
		/* Hook up test interrupt handler just for this test */
		if (!request_irq(irq, &e1000_test_intr, IRQF_PROBE_SHARED,
		netdev->name, netdev)) {
		netdev->name, netdev))
		shared_int = FALSE;
		} else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
		else if (request_irq(irq, &e1000_test_intr, IRQF_SHARED,
		netdev->name, netdev)) {
		*data = 1;
		return -1;
		}
		DPRINTK(PROBE,INFO, "testing %s interrupt\n",
		DPRINTK(HW, INFO, "testing %s interrupt\n",
		(shared_int ? "shared" : "unshared"));

		/* Disable all the interrupts */
		@@ -1269,11 +1269,10 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x9140);
		/* autoneg off */
		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x8140);
		} else if (adapter->hw.phy_type == e1000_phy_gg82563) {
		} else if (adapter->hw.phy_type == e1000_phy_gg82563)
		e1000_write_phy_reg(&adapter->hw,
		GG82563_PHY_KMRN_MODE_CTRL,
		0x1CC);
		}

		ctrl_reg = E1000_READ_REG(&adapter->hw, CTRL);

		@@ -1301,9 +1300,9 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
		}

		if (adapter->hw.media_type == e1000_media_type_copper &&
		adapter->hw.phy_type == e1000_phy_m88) {
		adapter->hw.phy_type == e1000_phy_m88)
		ctrl_reg \|= E1000_CTRL_ILOS; /* Invert Loss of Signal */
		} else {
		else {
		/* Set the ILOS bit on the fiber Nic is half
		* duplex link is detected. */
		stat_reg = E1000_READ_REG(&adapter->hw, STATUS);
		@@ -1439,11 +1438,10 @@ e1000_loopback_cleanup(struct e1000_adapter *adapter)
		case e1000_82546_rev_3:
		default:
		hw->autoneg = TRUE;
		if (hw->phy_type == e1000_phy_gg82563) {
		if (hw->phy_type == e1000_phy_gg82563)
		e1000_write_phy_reg(hw,
		GG82563_PHY_KMRN_MODE_CTRL,
		0x180);
		}
		e1000_read_phy_reg(hw, PHY_CTRL, &phy_reg);
		if (phy_reg & MII_CR_LOOPBACK) {
		phy_reg &= ~MII_CR_LOOPBACK;
		@@ -1677,14 +1675,12 @@ e1000_diag_test(struct net_device *netdev,
		msleep_interruptible(4 * 1000);
		}

		static void
		e1000_get_wol(struct net_device netdev, struct ethtool_wolinfo wol)
		static int e1000_wol_exclusion(struct e1000_adapter adapter, struct ethtool_wolinfo wol)
		{
		struct e1000_adapter *adapter = netdev_priv(netdev);
		struct e1000_hw *hw = &adapter->hw;
		int retval = 1; /* fail by default */

		switch (adapter->hw.device_id) {
		case E1000_DEV_ID_82542:
		switch (hw->device_id) {
		case E1000_DEV_ID_82543GC_FIBER:
		case E1000_DEV_ID_82543GC_COPPER:
		case E1000_DEV_ID_82544EI_FIBER:
		@@ -1692,42 +1688,77 @@ e1000_get_wol(struct net_device netdev, struct ethtool_wolinfo wol)
		case E1000_DEV_ID_82545EM_FIBER:
		case E1000_DEV_ID_82545EM_COPPER:
		case E1000_DEV_ID_82546GB_QUAD_COPPER:
		case E1000_DEV_ID_82546GB_PCIE:
		/* these don't support WoL at all */
		wol->supported = 0;
		wol->wolopts = 0;
		return;

		case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
		/* device id 10B5 port-A supports wol */
		if (!adapter->ksp3_port_a) {
		wol->supported = 0;
		return;
		}
		/* KSP3 does not suppport UCAST wake-ups for any interface */
		wol->supported = WAKE_MCAST \| WAKE_BCAST \| WAKE_MAGIC;

		if (adapter->wol & E1000_WUFC_EX)
		DPRINTK(DRV, ERR, "Interface does not support "
		"directed (unicast) frame wake-up packets\n");
		wol->wolopts = 0;
		goto do_defaults;

		break;
		case E1000_DEV_ID_82546EB_FIBER:
		case E1000_DEV_ID_82546GB_FIBER:
		case E1000_DEV_ID_82571EB_FIBER:
		/* Wake events only supported on port A for dual fiber */
		case E1000_DEV_ID_82571EB_SERDES:
		case E1000_DEV_ID_82571EB_COPPER:
		/* Wake events not supported on port B */
		if (E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1) {
		wol->supported = 0;
		wol->wolopts = 0;
		return;
		break;
		}
		/* Fall Through */

		/* return success for non excluded adapter ports */
		retval = 0;
		break;
		case E1000_DEV_ID_82571EB_QUAD_COPPER:
		case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
		/* quad port adapters only support WoL on port A */
		if (!adapter->quad_port_a) {
		wol->supported = 0;
		break;
		}
		/* return success for non excluded adapter ports */
		retval = 0;
		break;
		default:
		/* dual port cards only support WoL on port A from now on
		* unless it was enabled in the eeprom for port B
		* so exclude FUNC_1 ports from having WoL enabled */
		if (E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1 &&
		!adapter->eeprom_wol) {
		wol->supported = 0;
		break;
		}

		retval = 0;
		}

		return retval;
		}

		static void
		e1000_get_wol(struct net_device netdev, struct ethtool_wolinfo wol)
		{
		struct e1000_adapter *adapter = netdev_priv(netdev);

		wol->supported = WAKE_UCAST \| WAKE_MCAST \|
		WAKE_BCAST \| WAKE_MAGIC;
		wol->wolopts = 0;

		do_defaults:
		/* this function will set ->supported = 0 and return 1 if wol is not
		* supported by this hardware */
		if (e1000_wol_exclusion(adapter, wol))
		return;

		/* apply any specific unsupported masks here */
		switch (adapter->hw.device_id) {
		case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
		/* KSP3 does not suppport UCAST wake-ups */
		wol->supported &= ~WAKE_UCAST;

		if (adapter->wol & E1000_WUFC_EX)
		DPRINTK(DRV, ERR, "Interface does not support "
		"directed (unicast) frame wake-up packets\n");
		break;
		default:
		break;
		}

		if (adapter->wol & E1000_WUFC_EX)
		wol->wolopts \|= WAKE_UCAST;
		if (adapter->wol & E1000_WUFC_MC)
		@@ -1736,9 +1767,9 @@ e1000_get_wol(struct net_device netdev, struct ethtool_wolinfo wol)
		wol->wolopts \|= WAKE_BCAST;
		if (adapter->wol & E1000_WUFC_MAG)
		wol->wolopts \|= WAKE_MAGIC;

		return;
		}
		}

		static int
		e1000_set_wol(struct net_device netdev, struct ethtool_wolinfo wol)
		@@ -1746,40 +1777,25 @@ e1000_set_wol(struct net_device netdev, struct ethtool_wolinfo wol)
		struct e1000_adapter *adapter = netdev_priv(netdev);
		struct e1000_hw *hw = &adapter->hw;

		switch (adapter->hw.device_id) {
		case E1000_DEV_ID_82542:
		case E1000_DEV_ID_82543GC_FIBER:
		case E1000_DEV_ID_82543GC_COPPER:
		case E1000_DEV_ID_82544EI_FIBER:
		case E1000_DEV_ID_82546EB_QUAD_COPPER:
		case E1000_DEV_ID_82546GB_QUAD_COPPER:
		case E1000_DEV_ID_82545EM_FIBER:
		case E1000_DEV_ID_82545EM_COPPER:
		return wol->wolopts ? -EOPNOTSUPP : 0;
		if (wol->wolopts & (WAKE_PHY \| WAKE_ARP \| WAKE_MAGICSECURE))
		return -EOPNOTSUPP;

		case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
		/* device id 10B5 port-A supports wol */
		if (!adapter->ksp3_port_a)
		if (e1000_wol_exclusion(adapter, wol))
		return wol->wolopts ? -EOPNOTSUPP : 0;

		switch (hw->device_id) {
		case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:
		if (wol->wolopts & WAKE_UCAST) {
		DPRINTK(DRV, ERR, "Interface does not support "
		"directed (unicast) frame wake-up packets\n");
		return -EOPNOTSUPP;
		}

		case E1000_DEV_ID_82546EB_FIBER:
		case E1000_DEV_ID_82546GB_FIBER:
		case E1000_DEV_ID_82571EB_FIBER:
		/* Wake events only supported on port A for dual fiber */
		if (E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)
		return wol->wolopts ? -EOPNOTSUPP : 0;
		/* Fall Through */

		break;
		default:
		if (wol->wolopts & (WAKE_PHY \| WAKE_ARP \| WAKE_MAGICSECURE))
		return -EOPNOTSUPP;
		break;
		}

		/* these settings will always override what we currently have */
		adapter->wol = 0;

		if (wol->wolopts & WAKE_UCAST)
		@@ -1790,7 +1806,6 @@ e1000_set_wol(struct net_device netdev, struct ethtool_wolinfo wol)
		adapter->wol \|= E1000_WUFC_BC;
		if (wol->wolopts & WAKE_MAGIC)
		adapter->wol \|= E1000_WUFC_MAG;
		}

		return 0;
		}

drivers/net/e1000/e1000_hw.c

+512 −543

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		* Shared functions for accessing and configuring the MAC
		*/


		#include "e1000_hw.h"

		static int32_t e1000_set_phy_type(struct e1000_hw *hw);
		@@ -207,6 +208,7 @@ e1000_set_phy_type(struct e1000_hw *hw)
		return E1000_SUCCESS;
		}


		/******************************************************************************
		* IGP phy init script - initializes the GbE PHY
		*
		@@ -387,6 +389,7 @@ e1000_set_mac_type(struct e1000_hw *hw)
		case E1000_DEV_ID_82571EB_COPPER:
		case E1000_DEV_ID_82571EB_FIBER:
		case E1000_DEV_ID_82571EB_SERDES:
		case E1000_DEV_ID_82571EB_QUAD_COPPER:
		hw->mac_type = e1000_82571;
		break;
		case E1000_DEV_ID_82572EI_COPPER:
		@@ -912,7 +915,6 @@ e1000_init_hw(struct e1000_hw *hw)
		}



		if (hw->mac_type == e1000_82573) {
		uint32_t gcr = E1000_READ_REG(hw, GCR);
		gcr \|= E1000_GCR_L1_ACT_WITHOUT_L0S_RX;
		@@ -1352,7 +1354,7 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)
		return ret_val;
		}

		/* Wait 10ms for MAC to configure PHY from eeprom settings */
		/* Wait 15ms for MAC to configure PHY from eeprom settings */
		msec_delay(15);
		if (hw->mac_type != e1000_ich8lan) {
		/* Configure activity LED after PHY reset */
		@@ -1425,12 +1427,12 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)
		* resolution as hardware default. */
		if (hw->autoneg_advertised == ADVERTISE_1000_FULL) {
		/* Disable SmartSpeed */
		ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG, &phy_data);
		ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
		&phy_data);
		if (ret_val)
		return ret_val;
		phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
		ret_val = e1000_write_phy_reg(hw,
		IGP01E1000_PHY_PORT_CONFIG,
		ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CONFIG,
		phy_data);
		if (ret_val)
		return ret_val;
		@@ -1600,9 +1602,9 @@ e1000_copper_link_ggp_setup(struct e1000_hw *hw)
		return ret_val;

		phy_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;

		ret_val = e1000_write_phy_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
		phy_data);

		if (ret_val)
		return ret_val;
		}
		@@ -1792,7 +1794,6 @@ e1000_copper_link_autoneg(struct e1000_hw *hw)
		return E1000_SUCCESS;
		}


		/******************************************************************************
		* Config the MAC and the PHY after link is up.
		* 1) Set up the MAC to the current PHY speed/duplex
		@@ -2389,8 +2390,7 @@ e1000_phy_force_speed_duplex(struct e1000_hw *hw)
		return ret_val;

		if ((hw->mac_type == e1000_82544 \|\| hw->mac_type == e1000_82543) &&
		(!hw->autoneg) &&
		(hw->forced_speed_duplex == e1000_10_full \|\|
		(!hw->autoneg) && (hw->forced_speed_duplex == e1000_10_full \|\|
		hw->forced_speed_duplex == e1000_10_half)) {
		ret_val = e1000_polarity_reversal_workaround(hw);
		if (ret_val)
		@@ -2602,7 +2602,8 @@ e1000_config_fc_after_link_up(struct e1000_hw *hw)
		* configuration of the MAC to match the "fc" parameter.
		*/
		if (((hw->media_type == e1000_media_type_fiber) && (hw->autoneg_failed)) \|\|
		((hw->media_type == e1000_media_type_internal_serdes) && (hw->autoneg_failed)) \|\|
		((hw->media_type == e1000_media_type_internal_serdes) &&
		(hw->autoneg_failed)) \|\|
		((hw->media_type == e1000_media_type_copper) && (!hw->autoneg))) {
		ret_val = e1000_force_mac_fc(hw);
		if (ret_val) {
		@@ -3207,8 +3208,10 @@ e1000_shift_out_mdi_bits(struct e1000_hw *hw,
		* shifted out to the PHY by setting the MDIO bit to "0" and then
		* raising and lowering the clock.
		*/
		if(data & mask) ctrl \|= E1000_CTRL_MDIO;
		else ctrl &= ~E1000_CTRL_MDIO;
		if (data & mask)
		ctrl \|= E1000_CTRL_MDIO;
		else
		ctrl &= ~E1000_CTRL_MDIO;

		E1000_WRITE_REG(hw, CTRL, ctrl);
		E1000_WRITE_FLUSH(hw);
		@@ -3264,7 +3267,8 @@ e1000_shift_in_mdi_bits(struct e1000_hw *hw)
		e1000_raise_mdi_clk(hw, &ctrl);
		ctrl = E1000_READ_REG(hw, CTRL);
		/* Check to see if we shifted in a "1". */
		if(ctrl & E1000_CTRL_MDIO) data \|= 1;
		if (ctrl & E1000_CTRL_MDIO)
		data \|= 1;
		e1000_lower_mdi_clk(hw, &ctrl);
		}

		@@ -3582,7 +3586,7 @@ e1000_write_phy_reg_ex(struct e1000_hw *hw,
		E1000_WRITE_REG(hw, MDIC, mdic);

		/* Poll the ready bit to see if the MDI read completed */
		for(i = 0; i < 640; i++) {
		for (i = 0; i < 641; i++) {
		udelay(5);
		mdic = E1000_READ_REG(hw, MDIC);
		if (mdic & E1000_MDIC_READY) break;
		@@ -3757,14 +3761,13 @@ e1000_phy_hw_reset(struct e1000_hw *hw)

		/* Wait for FW to finish PHY configuration. */
		ret_val = e1000_get_phy_cfg_done(hw);
		if (ret_val != E1000_SUCCESS)
		return ret_val;
		e1000_release_software_semaphore(hw);

		if ((hw->mac_type == e1000_ich8lan) &&
		(hw->phy_type == e1000_phy_igp_3)) {
		if ((hw->mac_type == e1000_ich8lan) && (hw->phy_type == e1000_phy_igp_3))
		ret_val = e1000_init_lcd_from_nvm(hw);
		if (ret_val)
		return ret_val;
		}

		return ret_val;
		}

		@@ -3892,7 +3895,7 @@ e1000_kumeran_lock_loss_workaround(struct e1000_hw *hw)
		return E1000_SUCCESS;

		/* Make sure link is up before proceeding. If not just return.
		* Attempting this while link is negotiating fouls up link
		* Attempting this while link is negotiating fouled up link
		* stability */
		ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
		ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data);
		@@ -4053,7 +4056,7 @@ e1000_phy_reset_dsp(struct e1000_hw *hw)
		* hw - Struct containing variables accessed by shared code
		* phy_info - PHY information structure
		******************************************************************************/
		static int32_t
		int32_t
		e1000_phy_igp_get_info(struct e1000_hw *hw,
		struct e1000_phy_info *phy_info)
		{
		@@ -5553,40 +5556,6 @@ e1000_commit_shadow_ram(struct e1000_hw *hw)
		return error;
		}

		/******************************************************************************
		* Reads the adapter's part number from the EEPROM
		*
		* hw - Struct containing variables accessed by shared code
		* part_num - Adapter's part number
		*****************************************************************************/
		int32_t
		e1000_read_part_num(struct e1000_hw *hw,
		uint32_t *part_num)
		{
		uint16_t offset = EEPROM_PBA_BYTE_1;
		uint16_t eeprom_data;

		DEBUGFUNC("e1000_read_part_num");

		/* Get word 0 from EEPROM */
		if(e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
		DEBUGOUT("EEPROM Read Error\n");
		return -E1000_ERR_EEPROM;
		}
		/* Save word 0 in upper half of part_num */
		*part_num = (uint32_t) (eeprom_data << 16);

		/* Get word 1 from EEPROM */
		if(e1000_read_eeprom(hw, ++offset, 1, &eeprom_data) < 0) {
		DEBUGOUT("EEPROM Read Error\n");
		return -E1000_ERR_EEPROM;
		}
		/* Save word 1 in lower half of part_num */
		*part_num \|= eeprom_data;

		return E1000_SUCCESS;
		}

		/******************************************************************************
		* Reads the adapter's MAC address from the EEPROM and inverts the LSB for the
		* second function of dual function devices
		@@ -6133,6 +6102,7 @@ e1000_setup_led(struct e1000_hw *hw)
		return E1000_SUCCESS;
		}


		/******************************************************************************
		* Used on 82571 and later Si that has LED blink bits.
		* Callers must use their own timer and should have already called
		@@ -6320,7 +6290,7 @@ e1000_led_off(struct e1000_hw *hw)
		*
		* hw - Struct containing variables accessed by shared code
		*****************************************************************************/
		static void
		void
		e1000_clear_hw_cntrs(struct e1000_hw *hw)
		{
		volatile uint32_t temp;
		@@ -7572,7 +7542,7 @@ e1000_mng_host_if_write(struct e1000_hw * hw, uint8_t *buffer,
		{
		uint8_t *tmp;
		uint8_t *bufptr = buffer;
		uint32_t data;
		uint32_t data = 0;
		uint16_t remaining, i, j, prev_bytes;

		/* sum = only sum of the data and it is not checksum */
		@@ -7675,8 +7645,7 @@ e1000_mng_write_cmd_header(struct e1000_hw * hw,
		* returns - E1000_SUCCESS for success.
		****************************************************************************/
		static int32_t
		e1000_mng_write_commit(
		struct e1000_hw * hw)
		e1000_mng_write_commit(struct e1000_hw * hw)
		{
		uint32_t hicr;

drivers/net/e1000/e1000_hw.h

+14 −12

Original line number	Diff line number	Diff line
		@@ -470,6 +470,7 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw);
		#define E1000_DEV_ID_82571EB_COPPER 0x105E
		#define E1000_DEV_ID_82571EB_FIBER 0x105F
		#define E1000_DEV_ID_82571EB_SERDES 0x1060
		#define E1000_DEV_ID_82571EB_QUAD_COPPER 0x10A4
		#define E1000_DEV_ID_82572EI_COPPER 0x107D
		#define E1000_DEV_ID_82572EI_FIBER 0x107E
		#define E1000_DEV_ID_82572EI_SERDES 0x107F
		@@ -697,6 +698,7 @@ union e1000_rx_desc_packet_split {
		E1000_RXDEXT_STATERR_CXE \| \
		E1000_RXDEXT_STATERR_RXE)


		/* Transmit Descriptor */
		struct e1000_tx_desc {
		uint64_t buffer_addr; /* Address of the descriptor's data buffer */