diff options
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_hw.c')
-rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index fe7965ee4096..67647e264611 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c | |||
@@ -75,7 +75,6 @@ static void nes_process_iwarp_aeqe(struct nes_device *nesdev, | |||
75 | static void process_critical_error(struct nes_device *nesdev); | 75 | static void process_critical_error(struct nes_device *nesdev); |
76 | static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number); | 76 | static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number); |
77 | static unsigned int nes_reset_adapter_ne020(struct nes_device *nesdev, u8 *OneG_Mode); | 77 | static unsigned int nes_reset_adapter_ne020(struct nes_device *nesdev, u8 *OneG_Mode); |
78 | static void nes_terminate_timeout(unsigned long context); | ||
79 | static void nes_terminate_start_timer(struct nes_qp *nesqp); | 78 | static void nes_terminate_start_timer(struct nes_qp *nesqp); |
80 | 79 | ||
81 | #ifdef CONFIG_INFINIBAND_NES_DEBUG | 80 | #ifdef CONFIG_INFINIBAND_NES_DEBUG |
@@ -3520,7 +3519,7 @@ static void nes_terminate_received(struct nes_device *nesdev, | |||
3520 | } | 3519 | } |
3521 | 3520 | ||
3522 | /* Timeout routine in case terminate fails to complete */ | 3521 | /* Timeout routine in case terminate fails to complete */ |
3523 | static void nes_terminate_timeout(unsigned long context) | 3522 | void nes_terminate_timeout(unsigned long context) |
3524 | { | 3523 | { |
3525 | struct nes_qp *nesqp = (struct nes_qp *)(unsigned long)context; | 3524 | struct nes_qp *nesqp = (struct nes_qp *)(unsigned long)context; |
3526 | 3525 | ||
@@ -3530,11 +3529,7 @@ static void nes_terminate_timeout(unsigned long context) | |||
3530 | /* Set a timer in case hw cannot complete the terminate sequence */ | 3529 | /* Set a timer in case hw cannot complete the terminate sequence */ |
3531 | static void nes_terminate_start_timer(struct nes_qp *nesqp) | 3530 | static void nes_terminate_start_timer(struct nes_qp *nesqp) |
3532 | { | 3531 | { |
3533 | init_timer(&nesqp->terminate_timer); | 3532 | mod_timer(&nesqp->terminate_timer, (jiffies + HZ)); |
3534 | nesqp->terminate_timer.function = nes_terminate_timeout; | ||
3535 | nesqp->terminate_timer.expires = jiffies + HZ; | ||
3536 | nesqp->terminate_timer.data = (unsigned long)nesqp; | ||
3537 | add_timer(&nesqp->terminate_timer); | ||
3538 | } | 3533 | } |
3539 | 3534 | ||
3540 | /** | 3535 | /** |