From: Joe Jin <joe.jin@oracle.com>
Date: Thu, 17 May 2012 13:24:05 +0000 (+0800)
Subject: igbvf: Remove unnecessary irq disable/enable
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~230
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f0224db742164d3f8678ab1089176d546abbd677;p=users%2Fjedix%2Flinux-maple.git

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.

(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>
---

diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index d3f51a033c8a..4625bea435ce 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -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);