2 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index 2f1de8b90f9e..05efa6a8ce8e 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -604,11 +604,13 @@ int ixgbe_fcoe_enable(struct net_device *netdev)
 {
         int rc = -EINVAL;
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        struct ixgbe_fcoe *fcoe = &adapter->fcoe;
 
 
         if (!(adapter->flags & IXGBE_FLAG_FCOE_CAPABLE))
                 goto out_enable;
 
+        atomic_inc(&fcoe->refcnt);
         if (adapter->flags & IXGBE_FLAG_FCOE_ENABLED)
                 goto out_enable;
 
@@ -648,6 +650,7 @@ int ixgbe_fcoe_disable(struct net_device *netdev)
 {
         int rc = -EINVAL;
         struct ixgbe_adapter *adapter = netdev_priv(netdev);
+        struct ixgbe_fcoe *fcoe = &adapter->fcoe;
 
         if (!(adapter->flags & IXGBE_FLAG_FCOE_CAPABLE))
                 goto out_disable;
@@ -655,6 +658,9 @@ int ixgbe_fcoe_disable(struct net_device *netdev)
         if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
                 goto out_disable;
 
+        if (!atomic_dec_and_test(&fcoe->refcnt))
+                goto out_disable;
+
         e_info(drv, "Disabling FCoE offload features.\n");
         netdev->features &= ~NETIF_F_FCOE_CRC;
         netdev->features &= ~NETIF_F_FSO;
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ixgbe/ixgbe_fcoe.h
index abf4b2b3f252..4bc2c551c8db 100644
--- a/drivers/net/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ixgbe/ixgbe_fcoe.h
@@ -66,6 +66,7 @@ struct ixgbe_fcoe {
         u8 tc;
         u8 up;
 #endif
+        atomic_t refcnt;
         spinlock_t lock;
         struct pci_pool *pool;
         struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];