From 189a2d46a1ef8e5ad9ebc1ef20ba285b6fc1df28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Date: Thu, 14 Jul 2011 14:41:11 -0700 Subject: [PATCH] --- yaml --- r: 256308 b: refs/heads/master c: 1180e7d6599c1fb0c56a23a649a3eb37d877b9d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3d92ea477b2a..de2ce7141f24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c9c1b5456e3ba0b4a1a43866600e84bbba0db12 +refs/heads/master: 1180e7d6599c1fb0c56a23a649a3eb37d877b9d0 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 9ca15142d823..e57be0262051 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -5488,12 +5488,9 @@ int register_netdevice(struct net_device *dev) dev->features |= NETIF_F_NOCACHE_COPY; } - /* 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. + /* Make NETIF_F_HIGHDMA inheritable to VLAN devices. */ - dev->vlan_features |= (NETIF_F_SOFT_FEATURES | NETIF_F_HIGHDMA); + dev->vlan_features |= NETIF_F_HIGHDMA; ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev); ret = notifier_to_errno(ret);