1 files changed, 11 insertions, 1 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index bcb05cb799c1..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
@@ -5954,7 +5961,10 @@ EXPORT_SYMBOL(free_netdev);
 void synchronize_net(void)
 {
         might_sleep();
-        synchronize_rcu();
+        if (rtnl_is_locked())
+                synchronize_rcu_expedited();
+        else
+                synchronize_rcu();
 }
 EXPORT_SYMBOL(synchronize_net);