From 2fe5da68f566dc24088cc52e3b2abd1fcbbcf113 Mon Sep 17 00:00:00 2001 From: Pascal Bouchareine Date: Thu, 14 Jun 2012 02:18:18 +0000 Subject: [PATCH] --- yaml --- r: 315482 b: refs/heads/master c: 5d9a533bacff6fbaf711c92575f5f646c2c772f1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 42c99c8d6c2d..1ed39d4bb565 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddbe503203855939946430e39bae58de11b70b69 +refs/heads/master: 5d9a533bacff6fbaf711c92575f5f646c2c772f1 diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index c98cdf7de49d..b88218c7f60f 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -279,7 +279,7 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector, bool is_vlan = (status & IXGBE_RXD_STAT_VP); u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); - if (is_vlan && test_bit(tag, adapter->active_vlans)) + if (is_vlan && test_bit(tag & VLAN_VID_MASK, adapter->active_vlans)) __vlan_hwaccel_put_tag(skb, tag); napi_gro_receive(&q_vector->napi, skb);