diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/linux/ethtool.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'include/linux/ethtool.h')
| -rw-r--r-- | include/linux/ethtool.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index c7eff13d2f34..12cfbd0be2ee 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h | |||
| @@ -623,7 +623,7 @@ struct ethtool_sfeatures { | |||
| 623 | * values of corresponding bits in features[].requested. Bits in .requested | 623 | * values of corresponding bits in features[].requested. Bits in .requested |
| 624 | * not set in .valid or not changeable are ignored. | 624 | * not set in .valid or not changeable are ignored. |
| 625 | * | 625 | * |
| 626 | * Returns %EINVAL when .valid contains undefined or never-changable bits | 626 | * Returns %EINVAL when .valid contains undefined or never-changeable bits |
| 627 | * or size is not equal to required number of features words (32-bit blocks). | 627 | * or size is not equal to required number of features words (32-bit blocks). |
| 628 | * Returns >= 0 if request was completed; bits set in the value mean: | 628 | * Returns >= 0 if request was completed; bits set in the value mean: |
| 629 | * %ETHTOOL_F_UNSUPPORTED - there were bits set in .valid that are not | 629 | * %ETHTOOL_F_UNSUPPORTED - there were bits set in .valid that are not |