igbvf: Remove unnecessary irq disable/enable
authorMitch A Williams <mitch.a.williams@intel.com>
Wed, 18 Jan 2012 22:13:29 +0000 (22:13 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 19 Jan 2012 17:35:06 +0000 (12:35 -0500)
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>
drivers/net/ethernet/intel/igbvf/netdev.c

index fd3da3076c2f3bc6b10032defa1a838d0b5c59ef..a4b20c865759a28973407ad30181be1b733f05a3 100644 (file)
@@ -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);