From fb9cd8045631355f9730216aa788f45e6706e9d3 Mon Sep 17 00:00:00 2001 From: Patrick Mullaney Date: Sat, 16 Jan 2010 01:05:38 -0800 Subject: [PATCH] --- yaml --- r: 183529 b: refs/heads/master c: 6eb3a8553345ba2b4efd5390709e158289b9ece4 h: refs/heads/master i: 183527: 0a950acda31b3ac398a7cad61469b5463926061e v: v3 --- [refs] | 2 +- trunk/drivers/net/macvlan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 61126159809d..cb1e1f86199b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5c1da56afb8a6b232393fb3fdef4909389d05fe +refs/heads/master: 6eb3a8553345ba2b4efd5390709e158289b9ece4 diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c index 21a9c9ab4b34..fa0dc514dbaf 100644 --- a/trunk/drivers/net/macvlan.c +++ b/trunk/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))