Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 (041110a4) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/networking/e100.txt

+5 −14

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ Tx Descriptors: Number of transmit descriptors. A transmit descriptor is a data
		ethtool -G eth? tx n, where n is the number of desired tx descriptors.

		Speed/Duplex: The driver auto-negotiates the link speed and duplex settings by
		default. Ethtool can be used as follows to force speed/duplex.
		default. The ethtool utility can be used as follows to force speed/duplex.

		ethtool -s eth? autoneg off speed {10\|100} duplex {full\|half}

		@@ -126,30 +126,21 @@ Additional Configurations
		-------

		The driver utilizes the ethtool interface for driver configuration and
		diagnostics, as well as displaying statistical information. Ethtool
		diagnostics, as well as displaying statistical information. The ethtool
		version 1.6 or later is required for this functionality.

		The latest release of ethtool can be found from
		http://sourceforge.net/projects/gkernel.

		NOTE: Ethtool 1.6 only supports a limited set of ethtool options. Support
		for a more complete ethtool feature set can be enabled by upgrading
		ethtool to ethtool-1.8.1.

		http://ftp.kernel.org/pub/software/network/ethtool/

		Enabling Wake on LAN* (WoL)
		---------------------------
		WoL is provided through the Ethtool* utility. Ethtool is included with Red
		Hat* 8.0. For other Linux distributions, download and install Ethtool from
		the following website: http://sourceforge.net/projects/gkernel.

		For instructions on enabling WoL with Ethtool, refer to the Ethtool man page.
		WoL is provided through the ethtool* utility. For instructions on enabling
		WoL with ethtool, refer to the ethtool man page.

		WoL will be enabled on the system during the next shut down or reboot. For
		this driver version, in order to enable WoL, the e100 driver must be
		loaded when shutting down or rebooting the system.


		NAPI
		----

Documentation/networking/e1000.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -431,15 +431,15 @@ Additional Configurations
		Ethtool
		-------
		The driver utilizes the ethtool interface for driver configuration and
		diagnostics, as well as displaying statistical information. Ethtool
		diagnostics, as well as displaying statistical information. The ethtool
		version 1.6 or later is required for this functionality.

		The latest release of ethtool can be found from
		http://sourceforge.net/projects/gkernel.
		http://ftp.kernel.org/pub/software/network/ethtool/

		Enabling Wake on LAN* (WoL)
		---------------------------
		WoL is configured through the Ethtool* utility.
		WoL is configured through the ethtool* utility.

		WoL will be enabled on the system during the next shut down or reboot.
		For this driver version, in order to enable WoL, the e1000 driver must be

Documentation/networking/e1000e.txt

+7 −7

Original line number	Diff line number	Diff line
		@@ -269,26 +269,26 @@ Additional Configurations
		-------
		The driver utilizes the ethtool interface for driver configuration and
		diagnostics, as well as displaying statistical information. We
		strongly recommend downloading the latest version of Ethtool at:
		strongly recommend downloading the latest version of ethtool at:

		http://sourceforge.net/projects/gkernel.
		http://ftp.kernel.org/pub/software/network/ethtool/

		Speed and Duplex
		----------------
		Speed and Duplex are configured through the Ethtool* utility. For
		instructions, refer to the Ethtool man page.
		Speed and Duplex are configured through the ethtool* utility. For
		instructions, refer to the ethtool man page.

		Enabling Wake on LAN* (WoL)
		---------------------------
		WoL is configured through the Ethtool* utility. For instructions on
		enabling WoL with Ethtool, refer to the Ethtool man page.
		WoL is configured through the ethtool* utility. For instructions on
		enabling WoL with ethtool, refer to the ethtool man page.

		WoL will be enabled on the system during the next shut down or reboot.
		For this driver version, in order to enable WoL, the e1000e driver must be
		loaded when shutting down or rebooting the system.

		In most cases Wake On LAN is only supported on port A for multiple port
		adapters. To verify if a port supports Wake on Lan run Ethtool eth<X>.
		adapters. To verify if a port supports Wake on Lan run ethtool eth<X>.

		Support
		=======

Documentation/networking/igb.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -62,15 +62,15 @@ Additional Configurations
		-------
		The driver utilizes the ethtool interface for driver configuration and
		diagnostics, as well as displaying statistical information. The latest
		version of Ethtool can be found at:
		version of ethtool can be found at:

		http://ftp.kernel.org/pub/software/network/ethtool/

		Enabling Wake on LAN* (WoL)
		---------------------------
		WoL is configured through the Ethtool* utility.
		WoL is configured through the ethtool* utility.

		For instructions on enabling WoL with Ethtool, refer to the Ethtool man page.
		For instructions on enabling WoL with ethtool, refer to the ethtool man page.

		WoL will be enabled on the system during the next shut down or reboot.
		For this driver version, in order to enable WoL, the igb driver must be

Documentation/networking/igbvf.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,11 +58,11 @@ Additional Configurations
		Ethtool
		-------
		The driver utilizes the ethtool interface for driver configuration and
		diagnostics, as well as displaying statistical information. Ethtool
		diagnostics, as well as displaying statistical information. The ethtool
		version 3.0 or later is required for this functionality, although we
		strongly recommend downloading the latest version at:

		http://sourceforge.net/projects/gkernel.
		http://ftp.kernel.org/pub/software/network/ethtool/

		Support
		=======