aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch A Williams <mitch.a.williams@intel.com>2012-01-18 22:13:29 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-19 12:35:06 -0500
commit56b68960ce996db7947440179cc153652a504e9a (patch)
treefef7142399b3dd0bc59af40d1fa1ec2903dd615b
parentb2f0f6bb874df645766930e0f023a208d93c12cd (diff)
downloadlinux-linaro-stable-56b68960ce996db7947440179cc153652a504e9a.tar.gz
igbvf: Remove unnecessary irq disable/enable
This irq disable/enable pair used to wrap access to the driver's vlgrp struct, which is no longer present. So, then, this could also so no longer be present. Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/intel/igbvf/netdev.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index fd3da3076c2f..a4b20c865759 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/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);