From 70e40fcaa16d55fe492ecc6241a39727ee5d9155 Mon Sep 17 00:00:00 2001 From: Shan Wei Date: Tue, 5 Jul 2011 20:44:17 -0700 Subject: [PATCH] --- yaml --- r: 256129 b: refs/heads/master c: f9d7a1187dfefc6b54b53e0ffff4d26c0eff2702 h: refs/heads/master i: 256127: 1707a0614a5d9fae2b09a765d0e33bbe7d3aee1f v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 17da3406f29a..9be263a79d3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7736d33f4262d437c51ed7a28114eacbfca236ff +refs/heads/master: f9d7a1187dfefc6b54b53e0ffff4d26c0eff2702 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 4577e6711ec3..9ca15142d823 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -5488,11 +5488,12 @@ int register_netdevice(struct net_device *dev) dev->features |= NETIF_F_NOCACHE_COPY; } - /* Enable GRO and NETIF_F_HIGHDMA for vlans by default, - * vlan_dev_init() will do the dev->features check, so these features - * are enabled only if supported by underlying device. + /* Enable GSO, GRO and NETIF_F_HIGHDMA for vlans by default, + * vlan_dev_fix_features() will do the features check, + * so NETIF_F_HIGHDMA feature is enabled only if supported + * by underlying device. */ - dev->vlan_features |= (NETIF_F_GRO | NETIF_F_HIGHDMA); + dev->vlan_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_HIGHDMA); ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); ret = notifier_to_errno(ret);