From 04223051a59b5f0f45d5fb0cdc78637d44faa025 Mon Sep 17 00:00:00 2001 From: Greg Rose Date: Sat, 27 Aug 2011 02:06:25 +0000 Subject: [PATCH] --- yaml --- r: 266207 b: refs/heads/master c: dd1ed3b7bfed15f6162f63840941e9cf4f3611a1 h: refs/heads/master i: 266205: 38baee946ad52e57008ad2ef2660a8f654c959e2 266203: 44cb4a3496747563d98ab359e186eb3374e2c689 266199: 092ae6100e989174baa14ccdb2072f72297fc1f3 266191: 014f5740825edbdec99202743aee5900e405bdb4 266175: f0e193ff7a1774a93ab78157e99c3787a554dd9e v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index eca82ab2f986..90ecc6e4696e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5bc77a223b0e9b9dfb002048d2b34a79e7d0b48 +refs/heads/master: dd1ed3b7bfed15f6162f63840941e9cf4f3611a1 diff --git a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index d72905b77aba..4930c4605493 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/trunk/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c @@ -293,12 +293,10 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector, { struct ixgbevf_adapter *adapter = q_vector->adapter; bool is_vlan = (status & IXGBE_RXD_STAT_VP); + u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); - if (is_vlan) { - u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); - + if (is_vlan && test_bit(tag, adapter->active_vlans)) __vlan_hwaccel_put_tag(skb, tag); - } if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) napi_gro_receive(&q_vector->napi, skb);