diff options
| author | David S. Miller <davem@davemloft.net> | 2021-06-22 10:40:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-22 10:40:55 -0700 |
| commit | a4bdf76f54e142a5d54189f2c81b69095bf347ff (patch) | |
| tree | aedc601b478d092457ec44161e0921c2e1afaafa /include | |
| parent | 98534fce52efc76d961f5fe4188a97a5db93c7dd (diff) | |
| parent | 88f9a87afeeec5dfdda3651f3db96d0006172d91 (diff) | |
| download | cachepc-linux-a4bdf76f54e142a5d54189f2c81b69095bf347ff.tar.gz cachepc-linux-a4bdf76f54e142a5d54189f2c81b69095bf347ff.zip | |
Merge branch 'ethtool-eeprom'
Ido Schimmel says:
====================
ethtool: Module EEPROM API improvements
This patchset contains various improvements to recently introduced
module EEPROM netlink API. Noticed these while adding module EEPROM
write support.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ethtool.h | 12 | ||||
| -rw-r--r-- | include/uapi/linux/ethtool_netlink.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h index e030f7510cd3..29dbb603bc91 100644 --- a/include/linux/ethtool.h +++ b/include/linux/ethtool.h @@ -401,12 +401,12 @@ struct ethtool_rmon_stats { * required information to the driver. */ struct ethtool_module_eeprom { - __u32 offset; - __u32 length; - __u8 page; - __u8 bank; - __u8 i2c_address; - __u8 *data; + u32 offset; + u32 length; + u8 page; + u8 bank; + u8 i2c_address; + u8 *data; }; /** diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h index 825cfda1c5d5..c7135c9c37a5 100644 --- a/include/uapi/linux/ethtool_netlink.h +++ b/include/uapi/linux/ethtool_netlink.h @@ -675,7 +675,7 @@ enum { ETHTOOL_A_MODULE_EEPROM_PAGE, /* u8 */ ETHTOOL_A_MODULE_EEPROM_BANK, /* u8 */ ETHTOOL_A_MODULE_EEPROM_I2C_ADDRESS, /* u8 */ - ETHTOOL_A_MODULE_EEPROM_DATA, /* nested */ + ETHTOOL_A_MODULE_EEPROM_DATA, /* binary */ __ETHTOOL_A_MODULE_EEPROM_CNT, ETHTOOL_A_MODULE_EEPROM_MAX = (__ETHTOOL_A_MODULE_EEPROM_CNT - 1) |