diff options
author | Jing Huang <huangj@Brocade.COM> | 2012-04-04 01:42:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-04-04 18:19:17 -0400 |
commit | f96c1d24be47afcdc6376b03fe8f44a5250a202b (patch) | |
tree | b72360467852df4e8b382e6b3fafd4271cb409fd | |
parent | 4d58cd6470aca9cbddc630250305a2e9e6c0b792 (diff) |
bna: ioc cleanups
Remove irrelevant code. Change to start Hearbeat failure moniter after IOC
become operational.
Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_ioc.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bfa_ioc.c b/drivers/net/ethernet/brocade/bna/bfa_ioc.c index 7a3e79c7834b..0b640fafbda3 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_ioc.c +++ b/drivers/net/ethernet/brocade/bna/bfa_ioc.c | |||
@@ -70,7 +70,6 @@ static void bfa_ioc_reset(struct bfa_ioc *ioc, bool force); | |||
70 | static void bfa_ioc_mbox_poll(struct bfa_ioc *ioc); | 70 | static void bfa_ioc_mbox_poll(struct bfa_ioc *ioc); |
71 | static void bfa_ioc_mbox_flush(struct bfa_ioc *ioc); | 71 | static void bfa_ioc_mbox_flush(struct bfa_ioc *ioc); |
72 | static void bfa_ioc_recover(struct bfa_ioc *ioc); | 72 | static void bfa_ioc_recover(struct bfa_ioc *ioc); |
73 | static void bfa_ioc_check_attr_wwns(struct bfa_ioc *ioc); | ||
74 | static void bfa_ioc_event_notify(struct bfa_ioc *, enum bfa_ioc_event); | 73 | static void bfa_ioc_event_notify(struct bfa_ioc *, enum bfa_ioc_event); |
75 | static void bfa_ioc_disable_comp(struct bfa_ioc *ioc); | 74 | static void bfa_ioc_disable_comp(struct bfa_ioc *ioc); |
76 | static void bfa_ioc_lpu_stop(struct bfa_ioc *ioc); | 75 | static void bfa_ioc_lpu_stop(struct bfa_ioc *ioc); |
@@ -346,8 +345,6 @@ bfa_ioc_sm_getattr(struct bfa_ioc *ioc, enum ioc_event event) | |||
346 | switch (event) { | 345 | switch (event) { |
347 | case IOC_E_FWRSP_GETATTR: | 346 | case IOC_E_FWRSP_GETATTR: |
348 | del_timer(&ioc->ioc_timer); | 347 | del_timer(&ioc->ioc_timer); |
349 | bfa_ioc_check_attr_wwns(ioc); | ||
350 | bfa_ioc_hb_monitor(ioc); | ||
351 | bfa_fsm_set_state(ioc, bfa_ioc_sm_op); | 348 | bfa_fsm_set_state(ioc, bfa_ioc_sm_op); |
352 | break; | 349 | break; |
353 | 350 | ||
@@ -380,6 +377,7 @@ bfa_ioc_sm_op_entry(struct bfa_ioc *ioc) | |||
380 | { | 377 | { |
381 | ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_OK); | 378 | ioc->cbfn->enable_cbfn(ioc->bfa, BFA_STATUS_OK); |
382 | bfa_ioc_event_notify(ioc, BFA_IOC_E_ENABLED); | 379 | bfa_ioc_event_notify(ioc, BFA_IOC_E_ENABLED); |
380 | bfa_ioc_hb_monitor(ioc); | ||
383 | } | 381 | } |
384 | 382 | ||
385 | static void | 383 | static void |
@@ -2547,13 +2545,6 @@ bfa_ioc_recover(struct bfa_ioc *ioc) | |||
2547 | bfa_fsm_send_event(ioc, IOC_E_HBFAIL); | 2545 | bfa_fsm_send_event(ioc, IOC_E_HBFAIL); |
2548 | } | 2546 | } |
2549 | 2547 | ||
2550 | static void | ||
2551 | bfa_ioc_check_attr_wwns(struct bfa_ioc *ioc) | ||
2552 | { | ||
2553 | if (bfa_ioc_get_type(ioc) == BFA_IOC_TYPE_LL) | ||
2554 | return; | ||
2555 | } | ||
2556 | |||
2557 | /** | 2548 | /** |
2558 | * @dg hal_iocpf_pvt BFA IOC PF private functions | 2549 | * @dg hal_iocpf_pvt BFA IOC PF private functions |
2559 | * @{ | 2550 | * @{ |