Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f11970e383acd6f505f492f1bc07fb1a4d884829

Authored by Neil Horman
Committed by David S. Miller
1 parent 6dcbbe25dc
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

net: make dev_disable_lro use physical device if passed a vlan dev (v2) 

If the device passed into dev_disable_lro is a vlan, then repoint the dev
poniter so that we actually modify the underlying physical device.

Signed-of-by: Neil Horman <nhorman@tuxdriver.com>
CC: davem@davemloft.net
CC: bhutchings@solarflare.com

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 7 additions and 0 deletions Side-by-side Diff

... ... @@ -1308,6 +1308,13 @@
1308 1308 {
1309 1309 u32 flags;
1310 1310  
  1311 + /*
  1312 + * If we're trying to disable lro on a vlan device
  1313 + * use the underlying physical device instead
  1314 + */
  1315 + if (is_vlan_dev(dev))
  1316 + dev = vlan_dev_real_dev(dev);
  1317 +
1311 1318 if (dev->ethtool_ops && dev->ethtool_ops->get_flags)
1312 1319 flags = dev->ethtool_ops->get_flags(dev);
1313 1320 else