From 7a6ddc9dcb9b76fdf0bbea15c68bfd84d472f744 Mon Sep 17 00:00:00 2001 From: Mitch A Williams Date: Wed, 18 Jan 2012 22:13:29 +0000 Subject: [PATCH] --- yaml --- r: 286669 b: refs/heads/master c: 56b68960ce996db7947440179cc153652a504e9a h: refs/heads/master i: 286667: ebe535e9831877d52e609aaa9e40e346dae69d56 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igbvf/netdev.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a1e9d63673cf..bfbc5811688d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b2f0f6bb874df645766930e0f023a208d93c12cd +refs/heads/master: 56b68960ce996db7947440179cc153652a504e9a diff --git a/trunk/drivers/net/ethernet/intel/igbvf/netdev.c b/trunk/drivers/net/ethernet/intel/igbvf/netdev.c index fd3da3076c2f..a4b20c865759 100644 --- a/trunk/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/trunk/drivers/net/ethernet/intel/igbvf/netdev.c @@ -1194,11 +1194,6 @@ static int igbvf_vlan_rx_kill_vid(struct net_device *netdev, u16 vid) struct igbvf_adapter *adapter = netdev_priv(netdev); struct e1000_hw *hw = &adapter->hw; - igbvf_irq_disable(adapter); - - if (!test_bit(__IGBVF_DOWN, &adapter->state)) - igbvf_irq_enable(adapter); - if (hw->mac.ops.set_vfta(hw, vid, false)) { dev_err(&adapter->pdev->dev, "Failed to remove vlan id %d\n", vid);