aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bnx2.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bnx2.h')
-rw-r--r--drivers/net/bnx2.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 2b9649ae6307..34ca47812af4 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6679,8 +6679,6 @@ struct bnx2_napi {
6679 struct bnx2_tx_ring_info tx_ring; 6679 struct bnx2_tx_ring_info tx_ring;
6680}; 6680};
6681 6681
6682#define BNX2_TIMER_INTERVAL HZ
6683
6684struct bnx2 { 6682struct bnx2 {
6685 /* Fields used in the tx and intr/napi performance paths are grouped */ 6683 /* Fields used in the tx and intr/napi performance paths are grouped */
6686 /* together in the beginning of the structure. */ 6684 /* together in the beginning of the structure. */
@@ -6728,7 +6726,11 @@ struct bnx2 {
6728 6726
6729 /* End of fields used in the performance code paths. */ 6727 /* End of fields used in the performance code paths. */
6730 6728
6731 int current_interval; 6729 unsigned int current_interval;
6730#define BNX2_TIMER_INTERVAL HZ
6731#define BNX2_SERDES_AN_TIMEOUT (HZ / 3)
6732#define BNX2_SERDES_FORCED_TIMEOUT (HZ / 10)
6733
6732 struct timer_list timer; 6734 struct timer_list timer;
6733 struct work_struct reset_task; 6735 struct work_struct reset_task;
6734 6736
@@ -6860,8 +6862,6 @@ struct bnx2 {
6860#define PHY_LOOPBACK 2 6862#define PHY_LOOPBACK 2
6861 6863
6862 u8 serdes_an_pending; 6864 u8 serdes_an_pending;
6863#define SERDES_AN_TIMEOUT (HZ / 3)
6864#define SERDES_FORCED_TIMEOUT (HZ / 10)
6865 6865
6866 u8 mac_addr[8]; 6866 u8 mac_addr[8];
6867 6867
@@ -6959,14 +6959,14 @@ struct fw_info {
6959/* This value (in milliseconds) determines the frequency of the driver 6959/* This value (in milliseconds) determines the frequency of the driver
6960 * issuing the PULSE message code. The firmware monitors this periodic 6960 * issuing the PULSE message code. The firmware monitors this periodic
6961 * pulse to determine when to switch to an OS-absent mode. */ 6961 * pulse to determine when to switch to an OS-absent mode. */
6962#define DRV_PULSE_PERIOD_MS 250 6962#define BNX2_DRV_PULSE_PERIOD_MS 250
6963 6963
6964/* This value (in milliseconds) determines how long the driver should 6964/* This value (in milliseconds) determines how long the driver should
6965 * wait for an acknowledgement from the firmware before timing out. Once 6965 * wait for an acknowledgement from the firmware before timing out. Once
6966 * the firmware has timed out, the driver will assume there is no firmware 6966 * the firmware has timed out, the driver will assume there is no firmware
6967 * running and there won't be any firmware-driver synchronization during a 6967 * running and there won't be any firmware-driver synchronization during a
6968 * driver reset. */ 6968 * driver reset. */
6969#define FW_ACK_TIME_OUT_MS 1000 6969#define BNX2_FW_ACK_TIME_OUT_MS 1000
6970 6970
6971 6971
6972#define BNX2_DRV_RESET_SIGNATURE 0x00000000 6972#define BNX2_DRV_RESET_SIGNATURE 0x00000000