diff options
| author |   Anirban Chakraborty <anirban.chakraborty@qlogic.com> | 2011-04-01 14:28:15 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-04-06 12:47:12 -0700 |
| commit | b9796a14d9705c4be4a080a4fe39379a51681374 (patch) | |
| tree | c844b2198fc0e76707eac3bf802a9f930ade9078 /drivers/net/qlcnic/qlcnic_init.c | |
| parent | qlcnic: Code optimization patch (diff) | |
| download | linux-dev-b9796a14d9705c4be4a080a4fe39379a51681374.tar.xz linux-dev-b9796a14d9705c4be4a080a4fe39379a51681374.zip | |
qlcnic: Changes to VLAN code
Made changes to VLAN code comply with new VLAN infrastructure in kernel
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_init.c')
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_init.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c index 476ea14c0ff3..74ec96da1762 100644 --- a/drivers/net/qlcnic/qlcnic_init.c +++ b/drivers/net/qlcnic/qlcnic_init.c @@ -1467,10 +1467,10 @@ qlcnic_process_rcv(struct qlcnic_adapter *adapter, skb->protocol = eth_type_trans(skb, netdev); - if ((vid != 0xffff) && adapter->vlgrp) - vlan_gro_receive(&sds_ring->napi, adapter->vlgrp, vid, skb); - else - napi_gro_receive(&sds_ring->napi, skb); + if (vid != 0xffff) + __vlan_hwaccel_put_tag(skb, vid); + + napi_gro_receive(&sds_ring->napi, skb); adapter->stats.rx_pkts++; adapter->stats.rxbytes += length; @@ -1552,10 +1552,9 @@ qlcnic_process_lro(struct qlcnic_adapter *adapter, length = skb->len; - if ((vid != 0xffff) && adapter->vlgrp) - vlan_hwaccel_receive_skb(skb, adapter->vlgrp, vid); - else - netif_receive_skb(skb); + if (vid != 0xffff) + __vlan_hwaccel_put_tag(skb, vid); + netif_receive_skb(skb); adapter->stats.lro_pkts++; adapter->stats.lrobytes += length; |