32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From: Patrick Mullaney <pmullaney@novell.com>
|
|
Date: Sat, 16 Jan 2010 01:05:38 -0800
|
|
Subject: [PATCH] macvlan: add GRO bit to features mask
|
|
|
|
commit 6eb3a8553345ba2b4efd5390709e158289b9ece4 upstream.
|
|
|
|
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>
|
|
---
|
|
drivers/net/macvlan.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
|
|
index 21a9c9a..fa0dc51 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))
|
|
--
|
|
1.7.1
|
|
|