Commit 492c8b44 authored by Kirill Smelkov's avatar Kirill Smelkov

X Adjust the patch to new ethtool ksettings API

Similarly to e.g. d17970d7.
parent d98c38ef
...@@ -2381,15 +2381,15 @@ static struct rtl_coalesce_scale { ...@@ -2381,15 +2381,15 @@ static struct rtl_coalesce_scale {
static struct rtl_coalesce_scale *rtl_coalesce_scale(struct net_device *dev) static struct rtl_coalesce_scale *rtl_coalesce_scale(struct net_device *dev)
{ {
struct ethtool_cmd ecmd; struct ethtool_link_ksettings ecmd;
int rc, i; int rc, i;
rc = rtl8169_get_settings(dev, &ecmd); rc = rtl8169_get_link_ksettings(dev, &ecmd);
if (rc < 0) if (rc < 0)
return ERR_PTR(rc); return ERR_PTR(rc);
for (i = 0; i < ARRAY_SIZE(rtl_coalesce_info); i++) { for (i = 0; i < ARRAY_SIZE(rtl_coalesce_info); i++) {
if (ethtool_cmd_speed(&ecmd) == rtl_coalesce_info[i].speed) if (ecmd.base.speed == rtl_coalesce_info[i].speed)
return rtl_coalesce_info + i; return rtl_coalesce_info + i;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment