diff mbox

macvlan: add GRO bit to features mask

Message ID 20100115200039.10618.8232.stgit@mimic.site
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Patrick Mullaney Jan. 15, 2010, 8 p.m. UTC 
Allow macvlan devices to support GRO.

Signed-off-by: Patrick Mullaney <pmullaney@novell.com>

Acked-by: Patrick McHardy <kaber@trash.net>
---

 drivers/net/macvlan.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Jan. 16, 2010, 9:05 a.m. UTC | #1 
From: Patrick Mullaney <pmullaney@novell.com>
Date: Fri, 15 Jan 2010 15:00:51 -0500

> Allow macvlan devices to support GRO.
> 
> Signed-off-by: Patrick Mullaney <pmullaney@novell.com>
> 
> Acked-by: Patrick McHardy <kaber@trash.net>

Applied to net-next-2.6, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 0a389b8..94bb135 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -316,7 +316,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))