sfc: Disable flow control during flushes

[pandora-kernel.git] / drivers / net / ethernet / sfc / net_driver.h

diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h
index 18c4b3c..f526877 100644 (file)
--- a/drivers/net/ethernet/sfc/net_driver.h
+++ b/drivers/net/ethernet/sfc/net_driver.h
@@ -670,6 +670,9 @@ struct efx_filter_state;
  * @promiscuous: Promiscuous flag. Protected by netif_tx_lock.
  * @multicast_hash: Multicast hash table
  * @wanted_fc: Wanted flow control flags
+ * @fc_disable: When non-zero flow control is disabled. Typically used to
+ *     ensure that network back pressure doesn't delay dma queue flushes.
+ *     Serialised by the rtnl lock.
  * @mac_work: Work item for changing MAC promiscuity and multicast hash
  * @loopback_mode: Loopback status
  * @loopback_modes: Supported loopback mode bitmask
@@ -769,6 +772,7 @@ struct efx_nic {
        bool promiscuous;
        union efx_multicast_hash multicast_hash;
        u8 wanted_fc;
+       unsigned fc_disable;
 
        atomic_t rx_reset;
        enum efx_loopback_mode loopback_mode;