1 files changed, 5 insertions, 0 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 5bdce97b8175..09b3742c4c89 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5057,6 +5057,11 @@ int register_netdevice(struct net_device *dev)
         if (dev->features & NETIF_F_SG)
                 dev->features |= NETIF_F_GSO;
 
+        /* Enable GRO for vlans by default if dev->features has GRO also.
+         * vlan_dev_init() will do the dev->features check.
+         */
+        dev->vlan_features |= NETIF_F_GRO;
+
         ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
         ret = notifier_to_errno(ret);
         if (ret)