Patchwork [1/2] e1000e: Invoke VLAN GRO handler

login
register
mail settings
Submitter Herbert Xu
Date Jan. 13, 2009, 9:26 a.m.
Message ID <20090113092625.GA28015@gondor.apana.org.au>
Download mbox | patch
Permalink /patch/18195/
State Accepted
Delegated to: David Miller
Headers show

Comments

Herbert Xu - Jan. 13, 2009, 9:26 a.m.
Hi Dave:

I'm starting to convert the LRO users now.  Here's the first
patch which is trivial.  It simply completes the test driver
that I started out with.

e1000e: Invoke VLAN GRO handler

Now that VLAN has GRO support as well, we can call its GRO handler
as well.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>


Thanks,
David Miller - Jan. 15, 2009, 4:38 a.m.
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 13 Jan 2009 20:26:25 +1100

> e1000e: Invoke VLAN GRO handler
> 
> Now that VLAN has GRO support as well, we can call its GRO handler
> as well.
> 
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Applied to net-next-2.6
--
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

Patch

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 91817d0..f73faac 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -99,8 +99,8 @@  static void e1000_receive_skb(struct e1000_adapter *adapter,
 	skb->protocol = eth_type_trans(skb, netdev);
 
 	if (adapter->vlgrp && (status & E1000_RXD_STAT_VP))
-		vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
-					 le16_to_cpu(vlan));
+		vlan_gro_receive(&adapter->napi, adapter->vlgrp,
+				 le16_to_cpu(vlan), skb);
 	else
 		napi_gro_receive(&adapter->napi, skb);
 }