]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
igbvf: Remove unnecessary irq disable/enable
authorJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 13:24:05 +0000 (21:24 +0800)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 13:24:05 +0000 (21:24 +0800)
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.

(backeded from commit 56b68960ce996db7947440179cc153652a504e9a)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/igbvf/netdev.c

index d3f51a033c8a20ed53c288a863196c64b80c958f..4625bea435cef699b9e9e86ab5b716b0b60989f2 100644 (file)
@@ -1192,11 +1192,6 @@ static void 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);