1 files changed, 7 insertions, 0 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index ec11d757c1fc..c7e305d13b71 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1308,6 +1308,13 @@ void dev_disable_lro(struct net_device *dev)
 {
         u32 flags;
 
+        /*
+         * If we're trying to disable lro on a vlan device
+         * use the underlying physical device instead
+         */
+        if (is_vlan_dev(dev))
+                dev = vlan_dev_real_dev(dev);
+
         if (dev->ethtool_ops && dev->ethtool_ops->get_flags)
                 flags = dev->ethtool_ops->get_flags(dev);
         else