diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-06-23 21:33:24 +0200 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-23 21:33:24 +0200 |
commit | 93817be8b62c7fa1f1bdc3e8c037a73a60026be9 (patch) | |
tree | 873c207abc783edb4ead73b2b3a8a9b105f94420 /net/ethtool | |
parent | nfp: add 'ethtool --identify' support (diff) | |
parent | Merge tag 'net-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
download | linux-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.tar.xz linux-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ethtool')
-rw-r--r-- | net/ethtool/eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ethtool/eeprom.c b/net/ethtool/eeprom.c index 7e6b37a54add..1c94bb8ea03f 100644 --- a/net/ethtool/eeprom.c +++ b/net/ethtool/eeprom.c @@ -36,7 +36,7 @@ static int fallback_set_params(struct eeprom_req_info *request, if (request->page) offset = request->page * ETH_MODULE_EEPROM_PAGE_LEN + offset; - if (modinfo->type == ETH_MODULE_SFF_8079 && + if (modinfo->type == ETH_MODULE_SFF_8472 && request->i2c_address == 0x51) offset += ETH_MODULE_EEPROM_PAGE_LEN * 2; |