Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (c87fed15) · Commits · 戴 / test

drivers/net/3c59x.c

+0 −166

Original line number	Diff line number	Diff line
		@@ -17,172 +17,6 @@
		410 Severn Ave., Suite 210
		Annapolis MD 21403

		Linux Kernel Additions:

		0.99H+lk0.9 - David S. Miller - softnet, PCI DMA updates
		0.99H+lk1.0 - Jeff Garzik <jgarzik@pobox.com>
		Remove compatibility defines for kernel versions < 2.2.x.
		Update for new 2.3.x module interface
		LK1.1.2 (March 19, 2000)
		* New PCI interface (jgarzik)

		LK1.1.3 25 April 2000, Andrew Morton <andrewm@uow.edu.au>
		- Merged with 3c575_cb.c
		- Don't set RxComplete in boomerang interrupt enable reg
		- spinlock in vortex_timer to protect mdio functions
		- disable local interrupts around call to vortex_interrupt in
		vortex_tx_timeout() (So vortex_interrupt can use spin_lock())
		- Select window 3 in vortex_timer()'s write to Wn3_MAC_Ctrl
		- In vortex_start_xmit(), move the lock to _after_ we've altered
		vp->cur_tx and vp->tx_full. This defeats the race between
		vortex_start_xmit() and vortex_interrupt which was identified
		by Bogdan Costescu.
		- Merged back support for six new cards from various sources
		- Set vortex_have_pci if pci_module_init returns zero (fixes cardbus
		insertion oops)
		- Tell it that 3c905C has NWAY for 100bT autoneg
		- Fix handling of SetStatusEnd in 'Too much work..' code, as
		per 2.3.99's 3c575_cb (Dave Hinds).
		- Split ISR into two for vortex & boomerang
		- Fix MOD_INC/DEC races
		- Handle resource allocation failures.
		- Fix 3CCFE575CT LED polarity
		- Make tx_interrupt_mitigation the default

		LK1.1.4 25 April 2000, Andrew Morton <andrewm@uow.edu.au>
		- Add extra TxReset to vortex_up() to fix 575_cb hotplug initialisation probs.
		- Put vortex_info_tbl into __devinitdata
		- In the vortex_error StatsFull HACK, disable stats in vp->intr_enable as well
		as in the hardware.
		- Increased the loop counter in issue_and_wait from 2,000 to 4,000.

		LK1.1.5 28 April 2000, andrewm
		- Added powerpc defines (John Daniel <jdaniel@etresoft.com> said these work...)
		- Some extra diagnostics
		- In vortex_error(), reset the Tx on maxCollisions. Otherwise most
		chips usually get a Tx timeout.
		- Added extra_reset module parm
		- Replaced some inline timer manip with mod_timer
		(Franois romieu <Francois.Romieu@nic.fr>)
		- In vortex_up(), don't make Wn3_config initialisation dependent upon has_nway
		(this came across from 3c575_cb).

		LK1.1.6 06 Jun 2000, andrewm
		- Backed out the PPC defines.
		- Use del_timer_sync(), mod_timer().
		- Fix wrapped ulong comparison in boomerang_rx()
		- Add IS_TORNADO, use it to suppress 3c905C checksum error msg
		(Donald Becker, I Lee Hetherington <ilh@sls.lcs.mit.edu>)
		- Replace union wn3_config with BFINS/BFEXT manipulation for
		sparc64 (Pete Zaitcev, Peter Jones)
		- In vortex_error, do_tx_reset and vortex_tx_timeout(Vortex):
		do a netif_wake_queue() to better recover from errors. (Anders Pedersen,
		Donald Becker)
		- Print a warning on out-of-memory (rate limited to 1 per 10 secs)
		- Added two more Cardbus 575 NICs: 5b57 and 6564 (Paul Wagland)

		LK1.1.7 2 Jul 2000 andrewm
		- Better handling of shared IRQs
		- Reset the transmitter on a Tx reclaim error
		- Fixed crash under OOM during vortex_open() (Mark Hemment)
		- Fix Rx cessation problem during OOM (help from Mark Hemment)
		- The spinlocks around the mdio access were blocking interrupts for 300uS.
		Fix all this to use spin_lock_bh() within mdio_read/write
		- Only write to TxFreeThreshold if it's a boomerang - other NICs don't
		have one.
		- Added 802.3x MAC-layer flow control support

		LK1.1.8 13 Aug 2000 andrewm
		- Ignore request_region() return value - already reserved if Cardbus.
		- Merged some additional Cardbus flags from Don's 0.99Qk
		- Some fixes for 3c556 (Fred Maciel)
		- Fix for EISA initialisation (Jan Rekorajski)
		- Renamed MII_XCVR_PWR and EEPROM_230 to align with 3c575_cb and D. Becker's drivers
		- Fixed MII_XCVR_PWR for 3CCFE575CT
		- Added INVERT_LED_PWR, used it.
		- Backed out the extra_reset stuff

		LK1.1.9 12 Sep 2000 andrewm
		- Backed out the tx_reset_resume flags. It was a no-op.
		- In vortex_error, don't reset the Tx on txReclaim errors
		- In vortex_error, don't reset the Tx on maxCollisions errors.
		Hence backed out all the DownListPtr logic here.
		- In vortex_error, give Tornado cards a partial TxReset on
		maxCollisions (David Hinds). Defined MAX_COLLISION_RESET for this.
		- Redid some driver flags and device names based on pcmcia_cs-3.1.20.
		- Fixed a bug where, if vp->tx_full is set when the interface
		is downed, it remains set when the interface is upped. Bad
		things happen.

		LK1.1.10 17 Sep 2000 andrewm
		- Added EEPROM_8BIT for 3c555 (Fred Maciel)
		- Added experimental support for the 3c556B Laptop Hurricane (Louis Gerbarg)
		- Add HAS_NWAY to "3c900 Cyclone 10Mbps TPO"

		LK1.1.11 13 Nov 2000 andrewm
		- Dump MOD_INC/DEC_USE_COUNT, use SET_MODULE_OWNER

		LK1.1.12 1 Jan 2001 andrewm (2.4.0-pre1)
		- Call pci_enable_device before we request our IRQ (Tobias Ringstrom)
		- Add 3c590 PCI latency timer hack to vortex_probe1 (from 0.99Ra)
		- Added extended issue_and_wait for the 3c905CX.
		- Look for an MII on PHY index 24 first (3c905CX oddity).
		- Add HAS_NWAY to 3cSOHO100-TX (Brett Frankenberger)
		- Don't free skbs we don't own on oom path in vortex_open().

		LK1.1.13 27 Jan 2001
		- Added explicit `medialock' flag so we can truly
		lock the media type down with `options'.
		- "check ioremap return and some tidbits" (Arnaldo Carvalho de Melo <acme@conectiva.com.br>)
		- Added and used EEPROM_NORESET for 3c556B PM resumes.
		- Fixed leakage of vp->rx_ring.
		- Break out separate HAS_HWCKSM device capability flag.
		- Kill vp->tx_full (ANK)
		- Merge zerocopy fragment handling (ANK?)

		LK1.1.14 15 Feb 2001
		- Enable WOL. Can be turned on with `enable_wol' module option.
		- EISA and PCI initialisation fixes (jgarzik, Manfred Spraul)
		- If a device's internalconfig register reports it has NWAY,
		use it, even if autoselect is enabled.

		LK1.1.15 6 June 2001 akpm
		- Prevent double counting of received bytes (Lars Christensen)
		- Add ethtool support (jgarzik)
		- Add module parm descriptions (Andrzej M. Krzysztofowicz)
		- Implemented alloc_etherdev() API
		- Special-case the 'Tx error 82' message.

		LK1.1.16 18 July 2001 akpm
		- Make NETIF_F_SG dependent upon nr_free_highpages(), not on CONFIG_HIGHMEM
		- Lessen verbosity of bootup messages
		- Fix WOL - use new PM API functions.
		- Use netif_running() instead of vp->open in suspend/resume.
		- Don't reset the interface logic on open/close/rmmod. It upsets
		autonegotiation, and hence DHCP (from 0.99T).
		- Back out EEPROM_NORESET flag because of the above (we do it for all
		NICs).
		- Correct 3c982 identification string
		- Rename wait_for_completion() to issue_and_wait() to avoid completion.h
		clash.

		LK1.1.17 18Dec01 akpm
		- PCI ID 9805 is a Python-T, not a dual-port Cyclone. Apparently.
		And it has NWAY.
		- Mask our advertised modes (vp->advertising) with our capabilities
		(MII reg5) when deciding which duplex mode to use.
		- Add `global_options' as default for options[]. Ditto global_enable_wol,
		global_full_duplex.

		LK1.1.18 01Jul02 akpm
		- Fix for undocumented transceiver power-up bit on some 3c566B's
		(Donald Becker, Rahul Karnik)

		- See http://www.zip.com.au/~akpm/linux/#3c59x-2.3 for more details.
		- Also see Documentation/networking/vortex.txt

		LK1.1.19 10Nov02 Marc Zyngier <maz@wild-wind.fr.eu.org>
		- EISA sysfs integration.
		*/

		/*

drivers/net/8139too.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1709,6 +1709,7 @@ static int rtl8139_start_xmit (struct sk_buff skb, struct net_device dev)
		void __iomem *ioaddr = tp->mmio_addr;
		unsigned int entry;
		unsigned int len = skb->len;
		unsigned long flags;

		/* Calculate the next Tx descriptor entry. */
		entry = tp->cur_tx % NUM_TX_DESC;
		@@ -1725,7 +1726,7 @@ static int rtl8139_start_xmit (struct sk_buff skb, struct net_device dev)
		return 0;
		}

		spin_lock_irq(&tp->lock);
		spin_lock_irqsave(&tp->lock, flags);
		RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
		tp->tx_flag \| max(len, (unsigned int)ETH_ZLEN));

		@@ -1736,7 +1737,7 @@ static int rtl8139_start_xmit (struct sk_buff skb, struct net_device dev)

		if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
		netif_stop_queue (dev);
		spin_unlock_irq(&tp->lock);
		spin_unlock_irqrestore(&tp->lock, flags);

		if (netif_msg_tx_queued(tp))
		printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",

drivers/net/e1000/e1000.h

+8 −2

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@
		#ifdef NETIF_F_TSO
		#include <net/checksum.h>
		#endif
		#include <linux/workqueue.h>
		#include <linux/mii.h>
		#include <linux/ethtool.h>
		#include <linux/if_vlan.h>
		@@ -143,6 +142,7 @@ struct e1000_adapter;

		#define AUTO_ALL_MODES 0
		#define E1000_EEPROM_82544_APM 0x0004
		#define E1000_EEPROM_ICH8_APME 0x0004
		#define E1000_EEPROM_APME 0x0400

		#ifndef E1000_MASTER_SLAVE
		@@ -254,7 +254,6 @@ struct e1000_adapter {
		spinlock_t tx_queue_lock;
		#endif
		atomic_t irq_sem;
		struct work_struct watchdog_task;
		struct work_struct reset_task;
		uint8_t fc_autoneg;

		@@ -339,8 +338,14 @@ struct e1000_adapter {
		#ifdef NETIF_F_TSO
		boolean_t tso_force;
		#endif
		boolean_t smart_power_down; /* phy smart power down */
		unsigned long flags;
		};

		enum e1000_state_t {
		__E1000_DRIVER_TESTING,
		__E1000_RESETTING,
		};

		/* e1000_main.c */
		extern char e1000_driver_name[];
		@@ -348,6 +353,7 @@ extern char e1000_driver_version[];
		int e1000_up(struct e1000_adapter *adapter);
		void e1000_down(struct e1000_adapter *adapter);
		void e1000_reset(struct e1000_adapter *adapter);
		void e1000_reinit_locked(struct e1000_adapter *adapter);
		int e1000_setup_all_tx_resources(struct e1000_adapter *adapter);
		void e1000_free_all_tx_resources(struct e1000_adapter *adapter);
		int e1000_setup_all_rx_resources(struct e1000_adapter *adapter);

drivers/net/e1000/e1000_ethtool.c

+85 −56

Original line number	Diff line number	Diff line
		@@ -109,7 +109,8 @@ e1000_get_settings(struct net_device netdev, struct ethtool_cmd ecmd)
		SUPPORTED_1000baseT_Full\|
		SUPPORTED_Autoneg \|
		SUPPORTED_TP);

		if (hw->phy_type == e1000_phy_ife)
		ecmd->supported &= ~SUPPORTED_1000baseT_Full;
		ecmd->advertising = ADVERTISED_TP;

		if (hw->autoneg == 1) {
		@@ -203,11 +204,9 @@ e1000_set_settings(struct net_device netdev, struct ethtool_cmd ecmd)

		/* reset the link */

		if (netif_running(adapter->netdev)) {
		e1000_down(adapter);
		e1000_reset(adapter);
		e1000_up(adapter);
		} else
		if (netif_running(adapter->netdev))
		e1000_reinit_locked(adapter);
		else
		e1000_reset(adapter);

		return 0;
		@@ -254,10 +253,9 @@ e1000_set_pauseparam(struct net_device *netdev,
		hw->original_fc = hw->fc;

		if (adapter->fc_autoneg == AUTONEG_ENABLE) {
		if (netif_running(adapter->netdev)) {
		e1000_down(adapter);
		e1000_up(adapter);
		} else
		if (netif_running(adapter->netdev))
		e1000_reinit_locked(adapter);
		else
		e1000_reset(adapter);
		} else
		return ((hw->media_type == e1000_media_type_fiber) ?
		@@ -279,10 +277,9 @@ e1000_set_rx_csum(struct net_device *netdev, uint32_t data)
		struct e1000_adapter *adapter = netdev_priv(netdev);
		adapter->rx_csum = data;

		if (netif_running(netdev)) {
		e1000_down(adapter);
		e1000_up(adapter);
		} else
		if (netif_running(netdev))
		e1000_reinit_locked(adapter);
		else
		e1000_reset(adapter);
		return 0;
		}
		@@ -577,6 +574,7 @@ e1000_get_drvinfo(struct net_device *netdev,
		case e1000_82572:
		case e1000_82573:
		case e1000_80003es2lan:
		case e1000_ich8lan:
		sprintf(firmware_version, "%d.%d-%d",
		(eeprom_data & 0xF000) >> 12,
		(eeprom_data & 0x0FF0) >> 4,
		@@ -631,6 +629,9 @@ e1000_set_ringparam(struct net_device *netdev,
		tx_ring_size = sizeof(struct e1000_tx_ring) * adapter->num_tx_queues;
		rx_ring_size = sizeof(struct e1000_rx_ring) * adapter->num_rx_queues;

		while (test_and_set_bit(__E1000_RESETTING, &adapter->flags))
		msleep(1);

		if (netif_running(adapter->netdev))
		e1000_down(adapter);

		@@ -691,9 +692,11 @@ e1000_set_ringparam(struct net_device *netdev,
		adapter->rx_ring = rx_new;
		adapter->tx_ring = tx_new;
		if ((err = e1000_up(adapter)))
		return err;
		goto err_setup;
		}

		clear_bit(__E1000_RESETTING, &adapter->flags);

		return 0;
		err_setup_tx:
		e1000_free_all_rx_resources(adapter);
		@@ -701,6 +704,8 @@ err_setup_rx:
		adapter->rx_ring = rx_old;
		adapter->tx_ring = tx_old;
		e1000_up(adapter);
		err_setup:
		clear_bit(__E1000_RESETTING, &adapter->flags);
		return err;
		}

		@@ -754,6 +759,7 @@ e1000_reg_test(struct e1000_adapter adapter, uint64_t data)
		toggle = 0x7FFFF3FF;
		break;
		case e1000_82573:
		case e1000_ich8lan:
		toggle = 0x7FFFF033;
		break;
		default:
		@@ -773,11 +779,12 @@ e1000_reg_test(struct e1000_adapter adapter, uint64_t data)
		}
		/* restore previous status */
		E1000_WRITE_REG(&adapter->hw, STATUS, before);

		if (adapter->hw.mac_type != e1000_ich8lan) {
		REG_PATTERN_TEST(FCAL, 0xFFFFFFFF, 0xFFFFFFFF);
		REG_PATTERN_TEST(FCAH, 0x0000FFFF, 0xFFFFFFFF);
		REG_PATTERN_TEST(FCT, 0x0000FFFF, 0xFFFFFFFF);
		REG_PATTERN_TEST(VET, 0x0000FFFF, 0xFFFFFFFF);
		}
		REG_PATTERN_TEST(RDTR, 0x0000FFFF, 0xFFFFFFFF);
		REG_PATTERN_TEST(RDBAH, 0xFFFFFFFF, 0xFFFFFFFF);
		REG_PATTERN_TEST(RDLEN, 0x000FFF80, 0x000FFFFF);
		@@ -790,20 +797,22 @@ e1000_reg_test(struct e1000_adapter adapter, uint64_t data)
		REG_PATTERN_TEST(TDLEN, 0x000FFF80, 0x000FFFFF);

		REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x00000000);
		REG_SET_AND_CHECK(RCTL, 0x06DFB3FE, 0x003FFFFB);
		before = (adapter->hw.mac_type == e1000_ich8lan ?
		0x06C3B33E : 0x06DFB3FE);
		REG_SET_AND_CHECK(RCTL, before, 0x003FFFFB);
		REG_SET_AND_CHECK(TCTL, 0xFFFFFFFF, 0x00000000);

		if (adapter->hw.mac_type >= e1000_82543) {

		REG_SET_AND_CHECK(RCTL, 0x06DFB3FE, 0xFFFFFFFF);
		REG_SET_AND_CHECK(RCTL, before, 0xFFFFFFFF);
		REG_PATTERN_TEST(RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
		if (adapter->hw.mac_type != e1000_ich8lan)
		REG_PATTERN_TEST(TXCW, 0xC000FFFF, 0x0000FFFF);
		REG_PATTERN_TEST(TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
		REG_PATTERN_TEST(TIDV, 0x0000FFFF, 0x0000FFFF);

		for (i = 0; i < E1000_RAR_ENTRIES; i++) {
		REG_PATTERN_TEST(RA + ((i << 1) << 2), 0xFFFFFFFF,
		0xFFFFFFFF);
		value = (adapter->hw.mac_type == e1000_ich8lan ?
		E1000_RAR_ENTRIES_ICH8LAN : E1000_RAR_ENTRIES);
		for (i = 0; i < value; i++) {
		REG_PATTERN_TEST(RA + (((i << 1) + 1) << 2), 0x8003FFFF,
		0xFFFFFFFF);
		}
		@@ -817,7 +826,9 @@ e1000_reg_test(struct e1000_adapter adapter, uint64_t data)

		}

		for (i = 0; i < E1000_MC_TBL_SIZE; i++)
		value = (adapter->hw.mac_type == e1000_ich8lan ?
		E1000_MC_TBL_SIZE_ICH8LAN : E1000_MC_TBL_SIZE);
		for (i = 0; i < value; i++)
		REG_PATTERN_TEST(MTA + (i << 2), 0xFFFFFFFF, 0xFFFFFFFF);

		*data = 0;
		@@ -889,6 +900,8 @@ e1000_intr_test(struct e1000_adapter adapter, uint64_t data)
		/* Test each interrupt */
		for (; i < 10; i++) {

		if (adapter->hw.mac_type == e1000_ich8lan && i == 8)
		continue;
		/* Interrupt to test */
		mask = 1 << i;

		@@ -1246,8 +1259,22 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
		} else if (adapter->hw.phy_type == e1000_phy_gg82563) {
		e1000_write_phy_reg(&adapter->hw,
		GG82563_PHY_KMRN_MODE_CTRL,
		0x1CE);
		0x1CC);
		}

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

		if (adapter->hw.phy_type == e1000_phy_ife) {
		/* force 100, set loopback */
		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x6100);

		/* Now set up the MAC to the same speed/duplex as the PHY. */
		ctrl_reg &= ~E1000_CTRL_SPD_SEL; /* Clear the speed sel bits */
		ctrl_reg \|= (E1000_CTRL_FRCSPD \| /* Set the Force Speed Bit */
		E1000_CTRL_FRCDPX \| /* Set the Force Duplex Bit */
		E1000_CTRL_SPD_100 \|/* Force Speed to 100 */
		E1000_CTRL_FD); /* Force Duplex to FULL */
		} else {
		/* force 1000, set loopback */
		e1000_write_phy_reg(&adapter->hw, PHY_CTRL, 0x4140);

		@@ -1258,6 +1285,7 @@ e1000_integrated_phy_loopback(struct e1000_adapter *adapter)
		E1000_CTRL_FRCDPX \| /* Set the Force Duplex Bit */
		E1000_CTRL_SPD_1000 \|/* Force Speed to 1000 */
		E1000_CTRL_FD); /* Force Duplex to FULL */
		}

		if (adapter->hw.media_type == e1000_media_type_copper &&
		adapter->hw.phy_type == e1000_phy_m88) {
		@@ -1317,6 +1345,7 @@ e1000_set_phy_loopback(struct e1000_adapter *adapter)
		case e1000_82572:
		case e1000_82573:
		case e1000_80003es2lan:
		case e1000_ich8lan:
		return e1000_integrated_phy_loopback(adapter);
		break;

		@@ -1568,6 +1597,7 @@ e1000_diag_test(struct net_device *netdev,
		struct e1000_adapter *adapter = netdev_priv(netdev);
		boolean_t if_running = netif_running(netdev);

		set_bit(__E1000_DRIVER_TESTING, &adapter->flags);
		if (eth_test->flags == ETH_TEST_FL_OFFLINE) {
		/* Offline tests */

		@@ -1582,7 +1612,8 @@ e1000_diag_test(struct net_device *netdev,
		eth_test->flags \|= ETH_TEST_FL_FAILED;

		if (if_running)
		e1000_down(adapter);
		/* indicate we're in test mode */
		dev_close(netdev);
		else
		e1000_reset(adapter);

		@@ -1607,8 +1638,9 @@ e1000_diag_test(struct net_device *netdev,
		adapter->hw.autoneg = autoneg;

		e1000_reset(adapter);
		clear_bit(__E1000_DRIVER_TESTING, &adapter->flags);
		if (if_running)
		e1000_up(adapter);
		dev_open(netdev);
		} else {
		/* Online tests */
		if (e1000_link_test(adapter, &data[4]))
		@@ -1619,6 +1651,8 @@ e1000_diag_test(struct net_device *netdev,
		data[1] = 0;
		data[2] = 0;
		data[3] = 0;

		clear_bit(__E1000_DRIVER_TESTING, &adapter->flags);
		}
		msleep_interruptible(4 * 1000);
		}
		@@ -1778,21 +1812,18 @@ e1000_phys_id(struct net_device *netdev, uint32_t data)
		mod_timer(&adapter->blink_timer, jiffies);
		msleep_interruptible(data * 1000);
		del_timer_sync(&adapter->blink_timer);
		} else if (adapter->hw.mac_type < e1000_82573) {
		E1000_WRITE_REG(&adapter->hw, LEDCTL,
		(E1000_LEDCTL_LED2_BLINK_RATE \|
		E1000_LEDCTL_LED0_BLINK \| E1000_LEDCTL_LED2_BLINK \|
		(E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) \|
		(E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED0_MODE_SHIFT) \|
		(E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED1_MODE_SHIFT)));
		} else if (adapter->hw.phy_type == e1000_phy_ife) {
		if (!adapter->blink_timer.function) {
		init_timer(&adapter->blink_timer);
		adapter->blink_timer.function = e1000_led_blink_callback;
		adapter->blink_timer.data = (unsigned long) adapter;
		}
		mod_timer(&adapter->blink_timer, jiffies);
		msleep_interruptible(data * 1000);
		del_timer_sync(&adapter->blink_timer);
		e1000_write_phy_reg(&(adapter->hw), IFE_PHY_SPECIAL_CONTROL_LED, 0);
		} else {
		E1000_WRITE_REG(&adapter->hw, LEDCTL,
		(E1000_LEDCTL_LED2_BLINK_RATE \|
		E1000_LEDCTL_LED1_BLINK \| E1000_LEDCTL_LED2_BLINK \|
		(E1000_LEDCTL_MODE_LED_ON << E1000_LEDCTL_LED2_MODE_SHIFT) \|
		(E1000_LEDCTL_MODE_LINK_ACTIVITY << E1000_LEDCTL_LED1_MODE_SHIFT) \|
		(E1000_LEDCTL_MODE_LED_OFF << E1000_LEDCTL_LED0_MODE_SHIFT)));
		e1000_blink_led_start(&adapter->hw);
		msleep_interruptible(data * 1000);
		}

		@@ -1807,10 +1838,8 @@ static int
		e1000_nway_reset(struct net_device *netdev)
		{
		struct e1000_adapter *adapter = netdev_priv(netdev);
		if (netif_running(netdev)) {
		e1000_down(adapter);
		e1000_up(adapter);
		}
		if (netif_running(netdev))
		e1000_reinit_locked(adapter);
		return 0;
		}

drivers/net/e1000/e1000_hw.c

+1657 −115

File changed.

Preview size limit exceeded, changes collapsed.

Admin message