projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 288379f)
e1000e: Invoke VLAN GRO handler
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 15 Jan 2009 04:37:59 +0000 (20:37 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Jan 2009 22:34:03 +0000 (14:34 -0800)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/e1000e/netdev.c patch | blob | blame | history

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index ff5b66adfc42be77937e9cb503b18e8019207e75..2ffd7523a91c95b2e8934d4f6f6168a3c15cdc7c 100644 (file)
--- 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);
 }