From dc032c82af0ad4b868cdcc47cbb44812e580e636 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 23 Sep 2010 00:46:11 +0000 Subject: [PATCH] --- yaml --- r: 214761 b: refs/heads/master c: c5256c51232d8312755e8de2b514c426b19b101a h: refs/heads/master i: 214759: 6c0d510b212c4f17cb99cff9557c3a4dbcfa11c4 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8cd4878475a2..c25a28df8f1a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bba50b99b2410e863b38afdcd0280eb37f8a8bcc +refs/heads/master: c5256c51232d8312755e8de2b514c426b19b101a diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 2c7934f8cf3e..e0c0b86f57a1 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -5058,10 +5058,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. + /* 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. */ - dev->vlan_features |= NETIF_F_GRO; + dev->vlan_features |= (NETIF_F_GRO | NETIF_F_HIGHDMA); ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); ret = notifier_to_errno(ret);