Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / Documentation / ABI / testing / sysfs-class-net

diff --git a/Documentation/ABI/testing/sysfs-class-net b/Documentation/ABI/testing/sysfs-class-net
index ec2232f6a9494fa463a9c4694551049669d10f83..664a8f6a634f3588e769f4e72cc764f66d9c5f1e 100644 (file)
--- a/Documentation/ABI/testing/sysfs-class-net
+++ b/Documentation/ABI/testing/sysfs-class-net
@@ -135,7 +135,7 @@ Description:
                full: full duplex
 
                Note: This attribute is only valid for interfaces that implement
-               the ethtool get_settings method (mostly Ethernet).
+               the ethtool get_link_ksettings method (mostly Ethernet).
 
 What:          /sys/class/net/<iface>/flags
 Date:          April 2005
@@ -242,7 +242,7 @@ Description:
                an integer representing the link speed in Mbits/sec.
 
                Note: this attribute is only valid for interfaces that implement
-               the ethtool get_settings method (mostly Ethernet ).
+               the ethtool get_link_ksettings method (mostly Ethernet).
 
 What:          /sys/class/net/<iface>/tx_queue_len
 Date:          April 2005