From 2da78b043d1d26e7eefa69f3898052f7d8ce909f Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Thu, 16 Sep 2010 19:14:40 +0000 Subject: [PATCH] --- yaml --- r: 214561 b: refs/heads/master c: 5718d3b432757ac83f65c50dd61df9c1e0d88e61 h: refs/heads/master i: 214559: ad271eb0b2f1e072f6c0900326a812b85aa45bfa v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 67d1ee1d4e36..975a4906f1dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d57906633efd58ccd93f056ed436ffde5cb31aa8 +refs/heads/master: 5718d3b432757ac83f65c50dd61df9c1e0d88e61 diff --git a/trunk/drivers/net/qlcnic/qlcnic_init.c b/trunk/drivers/net/qlcnic/qlcnic_init.c index 10cebb15ccd4..9f994b968f4a 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_init.c +++ b/trunk/drivers/net/qlcnic/qlcnic_init.c @@ -1455,7 +1455,7 @@ qlcnic_process_rcv(struct qlcnic_adapter *adapter, skb->protocol = eth_type_trans(skb, netdev); if ((vid != 0xffff) && adapter->vlgrp) - vlan_hwaccel_receive_skb(skb, adapter->vlgrp, vid); + vlan_gro_receive(&sds_ring->napi, adapter->vlgrp, vid, skb); else napi_gro_receive(&sds_ring->napi, skb);