diff options
| author | Sasha Neftin <sasha.neftin@intel.com> | 2018-10-11 10:17:36 +0300 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2018-10-17 13:58:47 -0700 |
| commit | 208983f099d975b5da27907245b4c4ea5146210e (patch) | |
| tree | 1c3b845687991dfe492541f501bd227a1601116e /drivers/net/ethernet/intel/igc/igc.h | |
| parent | 4eb8080143a9d9fd513bacc65b2466c57983aaae (diff) | |
igc: Add watchdog
Code completion, remove obsolete code
Add watchdog methods
Signed-off-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc.h')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h index 86fa889b4ab6..cdf18a5d9e08 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -33,6 +33,8 @@ extern char igc_driver_version[]; #define IGC_FLAG_HAS_MSI BIT(0) #define IGC_FLAG_QUEUE_PAIRS BIT(4) #define IGC_FLAG_NEED_LINK_UPDATE BIT(9) +#define IGC_FLAG_MEDIA_RESET BIT(10) +#define IGC_FLAG_MAS_ENABLE BIT(12) #define IGC_FLAG_HAS_MSIX BIT(13) #define IGC_FLAG_VLAN_PROMISC BIT(15) @@ -290,6 +292,7 @@ struct igc_adapter { /* TX */ u16 tx_work_limit; + u32 tx_timeout_count; int num_tx_queues; struct igc_ring *tx_ring[IGC_MAX_TX_QUEUES]; @@ -348,6 +351,7 @@ struct igc_adapter { struct igc_mac_addr *mac_table; + unsigned long link_check_timeout; struct igc_info ei; }; @@ -417,6 +421,14 @@ static inline unsigned int igc_rx_pg_order(struct igc_ring *ring) return 0; } +static inline s32 igc_read_phy_reg(struct igc_hw *hw, u32 offset, u16 *data) +{ + if (hw->phy.ops.read_reg) + return hw->phy.ops.read_reg(hw, offset, data); + + return 0; +} + #define igc_rx_pg_size(_ring) (PAGE_SIZE << igc_rx_pg_order(_ring)) #define IGC_TXD_DCMD (IGC_ADVTXD_DCMD_EOP | IGC_ADVTXD_DCMD_RS) |