summaryrefslogtreecommitdiff
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
authorPatrick Mullaney <pmullaney@novell.com>2010-01-16 01:05:38 -0800
committerDavid S. Miller <davem@davemloft.net>2010-01-16 01:05:38 -0800
commit6eb3a8553345ba2b4efd5390709e158289b9ece4 (patch)
treea3ce439775e2365fbb9841381a7885461a6324f5 /drivers/net/macvlan.c
parentd5c1da56afb8a6b232393fb3fdef4909389d05fe (diff)
downloadlinux-3.10-6eb3a8553345ba2b4efd5390709e158289b9ece4.tar.gz
linux-3.10-6eb3a8553345ba2b4efd5390709e158289b9ece4.tar.bz2
linux-3.10-6eb3a8553345ba2b4efd5390709e158289b9ece4.zip
macvlan: add GRO bit to features mask
Allow macvlan devices to support GRO. Signed-off-by: Patrick Mullaney <pmullaney@novell.com> Acked-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r--drivers/net/macvlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 21a9c9ab4b3..fa0dc514dba 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -418,7 +418,7 @@ static struct lock_class_key macvlan_netdev_addr_lock_key;
#define MACVLAN_FEATURES \
(NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \
NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \
- NETIF_F_TSO_ECN | NETIF_F_TSO6)
+ NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO)
#define MACVLAN_STATE_MASK \
((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))