aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2009-01-14 20:37:59 -0800
committerDavid S. Miller <davem@davemloft.net>2009-01-21 14:34:03 -0800
commitc405b828161286729b6a5a729159114dca122923 (patch)
treeda50c52b37af4ba7ad67fcdb4cbc504b44d4695c /drivers
parentnet: Remove redundant NAPI functions (diff)
downloadlinux-dev-c405b828161286729b6a5a729159114dca122923.tar.xz
linux-dev-c405b828161286729b6a5a729159114dca122923.zip
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> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/e1000e/netdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index ff5b66adfc42..2ffd7523a91c 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);
}