From f2cabb291e3340e4bc65d3081be38a279230b579 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 14 Jan 2009 20:37:59 -0800 Subject: [PATCH] --- yaml --- r: 133845 b: refs/heads/master c: c405b828161286729b6a5a729159114dca122923 h: refs/heads/master i: 133843: 3763f576c5eeea9f3efabebf51ab7d4e2e1772e5 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9340d2a7114..090c5632de78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 288379f050284087578b77e04f040b57db3db3f8 +refs/heads/master: c405b828161286729b6a5a729159114dca122923 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index ff5b66adfc42..2ffd7523a91c 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/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); }