diff options
author | Vasu Dev <vasu.dev@intel.com> | 2009-12-10 12:59:31 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2009-12-12 17:30:34 -0500 |
commit | 55a66d3c1e57f7e3e554d6ec8011e840f3802f20 (patch) | |
tree | b13e6446ce4d397e5c7d774bf942a2563e1248e5 /drivers/scsi/libfc | |
parent | c1ecb90a66c5afc7cc5c9349f9c3714eef4a5cfb (diff) |
[SCSI] fcoe, libfc: adds enable/disable for fcoe interface
This is to allow fcoemon util to enable or disable a fcoe interface
according to DCB link state change.
Adds sysfs module param enable and disable for this and also
updates existing other module param description to be consistent
and more accurate since older description had double "fcoe" word
with less meaningful netdev reference to user space.
Adds code to ignore redundant fc_lport_enter_reset handling for a
already disabled fcoe interface by checking LPORT_ST_DISABLED
or LPORT_ST_LOGO states, this also prevents lport state transition
on link flap on a disabled interface.
Above changes required lport state transition to get out of
disabled or logo state on call to fc_fabric_login.
Signed-off-by: Vasu Dev <vasu.dev@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/libfc')
-rw-r--r-- | drivers/scsi/libfc/fc_lport.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c index 74338c83ad0a..0b165024a219 100644 --- a/drivers/scsi/libfc/fc_lport.c +++ b/drivers/scsi/libfc/fc_lport.c | |||
@@ -537,7 +537,9 @@ int fc_fabric_login(struct fc_lport *lport) | |||
537 | int rc = -1; | 537 | int rc = -1; |
538 | 538 | ||
539 | mutex_lock(&lport->lp_mutex); | 539 | mutex_lock(&lport->lp_mutex); |
540 | if (lport->state == LPORT_ST_DISABLED) { | 540 | if (lport->state == LPORT_ST_DISABLED || |
541 | lport->state == LPORT_ST_LOGO) { | ||
542 | fc_lport_state_enter(lport, LPORT_ST_RESET); | ||
541 | fc_lport_enter_reset(lport); | 543 | fc_lport_enter_reset(lport); |
542 | rc = 0; | 544 | rc = 0; |
543 | } | 545 | } |
@@ -967,6 +969,9 @@ static void fc_lport_enter_reset(struct fc_lport *lport) | |||
967 | FC_LPORT_DBG(lport, "Entered RESET state from %s state\n", | 969 | FC_LPORT_DBG(lport, "Entered RESET state from %s state\n", |
968 | fc_lport_state(lport)); | 970 | fc_lport_state(lport)); |
969 | 971 | ||
972 | if (lport->state == LPORT_ST_DISABLED || lport->state == LPORT_ST_LOGO) | ||
973 | return; | ||
974 | |||
970 | if (lport->vport) { | 975 | if (lport->vport) { |
971 | if (lport->link_up) | 976 | if (lport->link_up) |
972 | fc_vport_set_state(lport->vport, FC_VPORT_INITIALIZING); | 977 | fc_vport_set_state(lport->vport, FC_VPORT_INITIALIZING); |