Signed-off-by: Robert Love <[EMAIL PROTECTED]>
---
drivers/scsi/libfc/fc_lport.c | 1 -
drivers/scsi/libfc/fc_ns.c | 22 +---------------------
include/scsi/libfc/libfc.h | 1 -
3 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 3eac0b3..f9c4075 100644
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -444,7 +444,6 @@ int fc_set_mfs(struct fc_lport *lp, u32 mfs)
}
if (!rc && mfs < old_mfs) {
- lp->ns_disc_done = 0;
fc_lport_enter_reset(lp);
}
return rc;
diff --git a/drivers/scsi/libfc/fc_ns.c b/drivers/scsi/libfc/fc_ns.c
index 628d77b..281e226 100644
--- a/drivers/scsi/libfc/fc_ns.c
+++ b/drivers/scsi/libfc/fc_ns.c
@@ -40,7 +40,6 @@ static void fc_ns_gpn_ft_resp(struct fc_seq *, struct
fc_frame *, void *);
static int fc_ns_new_target(struct fc_lport *, struct fc_rport *,
struct fc_rport_identifiers *);
static void fc_ns_del_target(struct fc_lport *, struct fc_rport *);
-static void fc_ns_disc_done(struct fc_lport *);
static void fc_ns_error(struct fc_lport *, struct fc_frame *);
static void fc_ns_timeout(struct work_struct *);
@@ -263,8 +262,6 @@ int fc_ns_disc_start(struct fc_lport *lp)
fc_lport_unlock(lp);
error = fc_ns_new_target(lp, rport, &ids);
put_device(&rport->dev);
- if (!error)
- fc_ns_disc_done(lp);
} else {
fc_lport_unlock(lp);
fc_block_rports(lp);
@@ -288,8 +285,7 @@ static void fc_ns_retry(struct fc_lport *lp)
FC_DBG("Scheduling work\n");
schedule_delayed_work(&lp->ns_disc_work,
msecs_to_jiffies(delay));
- } else
- fc_ns_disc_done(lp);
+ }
}
/*
@@ -355,17 +351,6 @@ static void fc_ns_del_target(struct fc_lport *lp, struct
fc_rport *rport)
fc_remote_port_delete(rport); /* release hold from create */
}
-/*
- * Done with discovery
- */
-static void fc_ns_disc_done(struct fc_lport *lp)
-{
- lp->ns_disc_done = 1;
- lp->ns_disc_pending = 0;
- if (lp->ns_disc_requested)
- lp->tt.disc_start(lp);
-}
-
/**
* fc_ns_fill_dns_hdr - Fill in a name service request header
* @lp: Fibre Channel host port instance
@@ -434,12 +419,10 @@ static void fc_ns_error(struct fc_lport *lp, struct
fc_frame *fp)
fc_ns_gpn_ft_req(lp);
} else {
FC_DBG("err %d - ending", err);
- fc_ns_disc_done(lp);
}
break;
default:
FC_DBG("err %d - ending", err);
- fc_ns_disc_done(lp);
break;
}
}
@@ -536,8 +519,6 @@ static void fc_ns_gpn_ft_parse(struct fc_lport *lp, void
*buf, size_t len)
} else {
lp->ns_disc_buf_len = 0;
}
-
- fc_ns_disc_done(lp);
}
/*
@@ -598,7 +579,6 @@ static void fc_ns_gpn_ft_resp(struct fc_seq *sp, struct
fc_frame *fp,
} else if (ntohs(cp->ct_cmd) == FC_FS_RJT) {
FC_DBG("GPN_FT rejected reason %x exp %x "
"(check zoning)", cp->ct_reason, cp->ct_explan);
- fc_ns_disc_done(lp);
} else {
FC_DBG("GPN_FT unexpected response code %x\n",
ntohs(cp->ct_cmd));
diff --git a/include/scsi/libfc/libfc.h b/include/scsi/libfc/libfc.h
index 4d7291f..954d1c7 100644
--- a/include/scsi/libfc/libfc.h
+++ b/include/scsi/libfc/libfc.h
@@ -408,7 +408,6 @@ struct fc_lport {
/* Operational Information */
struct libfc_function_template tt;
u16 link_status;
- u8 ns_disc_done;
enum fc_lport_state state;
unsigned long boot_time;
_______________________________________________
devel mailing list
[email protected]
http://www.open-fcoe.org/mailman/listinfo/devel
