path: root/ethtool.c
AgeCommit message (Collapse)AuthorFilesLines
2013-07-01Ethtool: Free memory leak in do_sprivflags()Yuval Mintz1-0/+1
cmdline is allocated for usage in parse_generic_cmdline(), but is not released after its final usage. Signed-off-by: Yuval Mintz <> Signed-off-by: Ben Hutchings <>
2013-07-01Ethtool: Beautify private flags printYuval Mintz1-1/+11
When printing the private flags of the device, align all strings to have the same length. Signed-off-by: Yuval Mintz <> [bwh: Fix indentation] Signed-off-by: Ben Hutchings <>
2013-03-21ethtool: Add string to display support for KR PHYVasundhara, Volam1-0/+1
Signed-off-by: Vasundhara Volam <> Signed-off-by: Ben Hutchings <>
2013-02-28Restore 20000baseKR2 cap displayYaniv Rosner1-0/+1
Restore the 20000baseKR2 which was removed by mistake back in June 2012. Signed-off-by: Yaniv Rosner <> Signed-off-by: Ben Hutchings <>
2013-01-22Added dst-mac parameter for L3/L4 flow spec rules. This is usefull in ↵Yan Burman1-0/+5
vSwitch configurations. Signed-off-by: Yan Burman <> Signed-off-by: Amir Vadai <> Signed-off-by: Ben Hutchings <>
2012-12-03Implemented basic optics diagnostics for SFF-8472Aurelien Guillaume1-2/+15
The current output of -m has been modified so that everything lines up correctly. The --module-info option alias has been added. Signed-off-by: Aurelien Guillaume <> Signed-off-by: Ben Hutchings <>
2012-11-08ethtool: Support et131x registers in -dMark Einon1-0/+1
The et131x register set contains useful details of RX/TX queues for the device. This dumps them with the -d option. Signed-off-by: Mark Einon <> Signed-off-by: Ben Hutchings <>
2012-10-10Gracefully handle failure of register dump pretty-printerBen Hutchings1-3/+10
If we have a pretty-printer matching the driver name for a register dump, but it doesn't handle the reported dump version, then we currently fail and print: Cannot dump registers: Success Instead, fall back to hex dump. Also, don't use perror() to explain a failure of dump_regs(). errno is not meaningful in either failure case. Signed-off-by: Ben Hutchings <>
2012-10-05ethtool: --set-eee sends ETHTOOL_SEEE ioctl even if nothing changedBruce Allan1-1/+1
When setting EEE parameters with the --set-eee command line option, ethtool will send the ETHTOOL_SEEE ioctl down to the driver even if none of the provided parameters are a change from current settings. Simply ignore it when that happens as done with other ethtool commands. Signed-off-by: Bruce Allan <> Tested-by: Aaron Brown <> Signed-off-by: Jeff Kirsher <> Signed-off-by: Ben Hutchings <>
2012-09-06ethtool: don't overwrite useful bits in advertising bitfieldJohan Gunnarsson1-14/+77
There are bits in this bitfield that we want to leave untouched (PAUSE and ASYM_PAUSE bits) when changing other bits (speed and duplex bits.) Previously, these were always overwritten to zero when running commands like "ethtool -s eth0 speed 10 duplex full autoneg off". Signed-off-by: Johan Gunnarsson <> [bwh: Fixed spelling and formatting] Signed-off-by: Ben Hutchings <>
2012-09-06ethtool: allow setting MDI-X stateJesse Brandeburg1-10/+45
A bit ago ethtool added support for reading MDI-X state, this patch finishes the implementation, adding the complementary write command. Add support to ethtool for controlling the MDI-X (crossover) state of a network port. Most adapters correctly negotiate MDI-X, but some ill-behaved switches have trouble and end up picking the wrong MDI setting, which results in complete loss of link. Usually this error condition can be observed when multiple ethtool -r ethX are required before link is achieved. This patch allows the user to override the normal "auto" setting and force the crossover state to on or off. The set will fail if the driver doesn't support the get, as suggested by Ben Hutchings. setting MDI not supported In addition the do_gset output was changed slightly to report the value set by the user (when the driver supports the set) old: MDI-X: on new: MDI-X: on (auto) or MDI-X: on (forced) usage is ethtool -s eth0 mdix [auto|on|off] Signed-off-by: Jesse Brandeburg <> CC: Ben Hutchings <> Tested-by: Aaron Brown Signed-off-by: Jeff Kirsher <> Signed-off-by: Ben Hutchings <>
2012-07-16Merge commit 'v3.4.2'Ben Hutchings1-27/+74
2012-07-16ethtool: added support for 40G link.Parav Pandit1-0/+4
1. defined values for KR4, CR4, SR4, LR4 PHY. Signed-off-by: Parav Pandit <> Signed-off-by: Ben Hutchings <>
2012-07-16Don't trust drivers to null-terminate stringsBen Hutchings1-15/+23
Some drivers have been seen to fill all bytes of ethtool_drvinfo::fw_version without including a null terminator, which effectively concatenates the following bytes to the string. We've already dealt with a similar problem in dump_stats() (commit 7764430a139e4a089127f5616b0d56f497be1036). Try to cover all the remaining string fields: - In dump_drvinfo(), limit the length using printf() modifiers - Add an option to get_stringset() to null-terminate all strings - Change all callers except dump_stats() to set that option Signed-off-by: Ben Hutchings <>
2012-07-16Ethtool: Add EEE supportYuval Mintz1-20/+116
This patch adds 2 new ethtool commands which can be used to manipulate network interfaces' support in EEE. Output of 'get' has the following form: EEE Settings for p2p1: EEE status: enabled - active Tx LPI: 1000 (us) Supported EEE link modes: 10000baseT/Full Advertised EEE link modes: 10000baseT/Full Link partner advertised EEE link modes: 10000baseT/Full Thanks goes to Giuseppe Cavallaro for his original patch. Signed-off-by: Yuval Mintz <> Signed-off-by: Eilon Greenstein <> Signed-off-by: Ben Hutchings <>
2012-07-16Fix reporting of VLAN tag offload flags on Linux < 2.6.37Ben Hutchings1-0/+41
These kernel versions implement ETHTOOL_GFLAGS but do not include the flags for VLAN tag offload (and do not implement ETHTOOL_GFEATURES). Since the VLAN tag offload features were already defined and implemented by many drivers, we shouldn't assume they are off. Instead, since these feature flag values were stable, read them from sysfs. Signed-off-by: Ben Hutchings <>
2012-07-16Remove bogus error message when changing offload settings on Linux < 2.6.39Ben Hutchings1-27/+33
We should not be checking for fixed features when we have no information about which are fixed. Signed-off-by: Ben Hutchings <>
2012-06-13Merge commit 'v3.4.1'Ben Hutchings1-2/+10
2012-06-13ethtool: Handle more errors when getting feature namesBen Hutchings1-2/+10
'ethtool -k eth0' generally works for unprivileged users, but in some kernel versions ETHTOOL_GSSET_INFO wrongly returns -EPERM. We need to fall back to the old offload operations in this case. Also, if we get some other error code, report that before exiting. Add regression test cases covering this and some other operations that may fail (which were already handled correctly). Signed-off-by: Ben Hutchings <>
2012-06-08Make link mode listing in dump_link_caps() a data-driven loopBen Hutchings1-68/+31
This removes lots of repeated code and makes it trivial to support additional modes. Signed-off-by: Ben Hutchings <>
2012-06-08ethtool: fix to display support for KX4 and KX PHYAjit Khaparde1-0/+14
Signed-off-by: Ajit Khaparde <> Signed-off-by: Ben Hutchings <>
2012-06-02Change -k/-K options to use ETHTOOL_{G,S}FEATURESBen Hutchings1-92/+356
Rewrite the offload get and set functions to use the generic features API where available, while maintaining a similar output format. Add the long options --show-features and --features as additional aliases for -k and -K. Where there is exactly one named feature corresponding to an old offload name, show the feature using the old offload name. Where there are multiple features corresponding to an old offload name, show the features as a group, indented underneath it. Add some test cases to check that this works properly with or without the generic features API. (These may well be insufficient.) Signed-off-by: Ben Hutchings <>
2012-06-02Report when offload feature changes are not exactly as requestedBen Hutchings1-20/+45
When an offload feature is enabled or disabled, this can change the state of other features that depend on it, or may itself be deferred if it depends on a feature that is disabled. Report when this happens, and fail if no offload features could be changed. Signed-off-by: Ben Hutchings <>
2012-06-02Regularise offload feature settingsBen Hutchings1-202/+89
This is partly preparation for use of the new net device features API, but is useful in its own right. Replace repetitive code for getting/setting offload flags with data- driven loops. This changes error messages to use the same long names for offload flags as in dump_offload(), and changes various exit codes to 1. Signed-off-by: Ben Hutchings <>
2012-06-01Add output file parameter to dump_hex() and make it externBen Hutchings1-9/+10
Signed-off-by: Ben Hutchings <>
2012-05-23Run tests in-processBen Hutchings1-6/+3
Wrap main(), exit(), and resource management so that ethtool commands can be tested without starting a new process and without leaking. This will allow deeper teesting that covers ioctl requests and responses. Signed-off-by: Ben Hutchings <>
2012-05-23ethtool: Addition of -m option to dump module eepromStuart Hodgson1-0/+87
The -m option now allows for retrieval of EEPROM information form a plug in module such as SFP+. This shows specific information about the type and capabilities of the module in use The format can be easily extended to support other modules types such as QSFP in future. Raw data dump is also supported. Signed-off-by: Stuart Hodgson <> Signed-off-by: Ben Hutchings <>
2012-05-23ethtool: Split out printing of hex dataStuart Hodgson1-17/+18
Split out printing of hex data to common function from dump_regs and dump_eeprom. Ready for use by module eeprom dumping. Signed-off-by: Stuart Hodgson <> [bwh: Line up columns like the version in dump_eeprom(), not dump_regs()] Signed-off-by: Ben Hutchings <>
2012-05-23Add the command to show the time stamping capabilities.Richard Cochran1-0/+104
Signed-off-by: Richard Cochran <> [bwh: Rename the long option to '--show-time-stamping'] Signed-off-by: Ben Hutchings <>
2012-01-21Merge RX NFC optionsBen Hutchings1-102/+76
Santwona Behera originally intended to extend the -n and -N options to cover querying and setting rules as well as flow hash options. However, his patch fell between the cracks and the ethtool utility got n-tuple support first, using the -u and -U options. When RX NFC rule support was finally added I insisted that it should not require different command syntax, so rules must be accessed through these options. The sets of valid argument lists following the -n and -u options are still non-overlapping, and similarly for the -N and -U options. Since the top level argument parser now supports arbitrary numbers of option aliases, we can merge these pairs together and achieve the original intent. Signed-off-by: Ben Hutchings <>
2012-01-20Move '--flash' down the list of optionsBen Hutchings1-3/+3
It doesn't make sense to to list it between the two RX NFC options in the online help. Signed-off-by: Ben Hutchings <>
2012-01-12rxclass: Use RX_CLS_LOC_{ANY,SPECIAL} in place of RX_CLS_LOC_UNSPECBen Hutchings1-1/+1
The macro RX_CLS_LOC_ANY is now defined in ethtool(-copy).h with the same intended semantics and same value as RX_CLS_LOC_UNSPEC. Change some equality tests to check for the flag RX_CLS_LOC_SPECIAL, to allow for future support of other special location value. Remove the special case for RX_CLS_LOC_UNSPEC in rxclass_print_nfc_rule(), since it is dead code. Signed-off-by: Ben Hutchings <>
2011-12-02Add support for querying and setting private flagsBen Hutchings1-2/+103
Signed-off-by: Ben Hutchings <>
2011-11-30Implement and use a generic get_stringset() functionBen Hutchings1-54/+67
Signed-off-by: Ben Hutchings <>
2011-11-03Rearrange definitions and remove unnecessary forward declarationsBen Hutchings1-243/+204
Most functions in ethtool.c are defined before use. The major exception is that the args array refers to a large number of functions defined after it. Move the args array and show_usage() functions down, and move a few other functions up. This leaves just one forward declaration in ethtool.c, which is unavoidable because show_usage() and args refer to each other. Signed-off-by: Ben Hutchings <>
2011-11-03Declare static variables const as appropriateBen Hutchings1-2/+2
Signed-off-by: Ben Hutchings <>
2011-11-03Change most static global variables into automatic variablesBen Hutchings1-260/+293
This is necessary preparation for in-process testing. It should also reduce the risk of some classes of bug by putting declaration and use closer together. Add parameters to various functions as necessary. Leave the global constants alone. Signed-off-by: Ben Hutchings <>
2011-11-03Replace global devname variable with a field in struct cmd_contextBen Hutchings1-13/+11
Signed-off-by: Ben Hutchings <>
2011-11-03Convert cmdline_msglvl into array of named flags; convert back at run-timeBen Hutchings1-35/+44
cmdline_msglvl is used both in do_gset() and do_sset(), but it refers to variables only used in do_sset(). I want to get rid of the global variables without duplicating the flag definitions. So separate out the flag definitions into a new structure and generate cmdline_msglvl from that at run-time. Signed-off-by: Ben Hutchings <>
2011-11-03Fix reference to cmdline_ring in do_schannels()Ben Hutchings1-1/+1
cmdline_ring and cmdline_channels have the same array size, so this just happened to work. Signed-off-by: Ben Hutchings <>
2011-11-03Support arbitrary numbers of option names for each modeBen Hutchings1-52/+58
Instead of supporting a single short and long option for each mode, take a string of options separated by "|" (matching the way they are displayed in online help). Signed-off-by: Ben Hutchings <>
2011-11-03Move argument parsing to sub-command functionsBen Hutchings1-606/+382
Instead of doing most of the argument parsing in parse_cmdline(), find the sub-command and (if required) the device name in main() and do the rest in the sub-command handler function. Pass argc and argp around in struct cmd_context. This also tightens up argument parsing slightly: extraneous or missing arguments will now result in an error in a few cases where they were previously ignored. All test cases now pass. Replace sub-command dispatch in doit() with a function pointer in struct option. Signed-off-by: Ben Hutchings <>
2011-11-03Add test cases for command-line parsingBen Hutchings1-0/+5
Preparation for refactoring command-line parsing. All these test cases pass. Signed-off-by: Ben Hutchings <>
2011-11-01Encapsulate command context in a structureBen Hutchings1-245/+174
Replace the fd and ifr arguments to each sub-command handler with struct cmd_context. Change send_ioctl() to take a pointer to this context and a pointer to the ethtool_cmd or other structure. Use send_ioctl() consistently. Signed-off-by: Ben Hutchings <>
2011-11-01Use standard indentation for definition of struct option argsBen Hutchings1-138/+142
Also put the whole of the help string on a line of its own where necessary. Signed-off-by: Ben Hutchings <>
2011-11-01Fix format of help text for -f optionBen Hutchings1-2/+2
Signed-off-by: Ben Hutchings <>
2011-11-01Combine ethtool-{bitops,util}.h into internal.hBen Hutchings1-1/+1
ethtool-util.h contains all kinds of declarations, not just utility functions or macros. ethtool-bitops.h contains just a few extra definitions, and its only user also includes ethtool-util.h. Signed-off-by: Ben Hutchings <>
2011-10-28Report pause frame autonegotiation resultBen Hutchings1-6/+40
If pause frame autonegotiation is enabled and the driver reports the link partner's advertising flags, report the result of autonegotiation. Signed-off-by: Ben Hutchings <>
2011-10-17ethtool: add ETHTOOL_{G,S}CHANNEL support.Sucheta Chakraborty1-0/+120
Used to configure number of tx/ rx/ other channels. Reqd. man page changes are included. Signed-off-by: Sucheta Chakraborty <> Signed-off-by: Ben Hutchings <>
2011-10-04ethtool: add support for external loopback.Sucheta Chakraborty1-2/+12
External loopback will be performed in addition to other offline tests. User need to pass new parameter "external_lb" for the same. Reqd. man page changes included. Signed-off-by: Sucheta Chakraborty <> [bwh: Report whether the external loopback test 'was', not 'is' executed. For compatibility, don't report this if not requested.] Signed-off-by: Ben Hutchings <>