aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/libfc/fc_disc.c3
-rw-r--r--include/scsi/libfc.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index 736f91742064..8427396909e8 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -43,8 +43,6 @@
43#define FC_DISC_RETRY_LIMIT 3 /* max retries */ 43#define FC_DISC_RETRY_LIMIT 3 /* max retries */
44#define FC_DISC_RETRY_DELAY 500UL /* (msecs) delay */ 44#define FC_DISC_RETRY_DELAY 500UL /* (msecs) delay */
45 45
46#define FC_DISC_DELAY 3
47
48static void fc_disc_gpn_ft_req(struct fc_disc *); 46static void fc_disc_gpn_ft_req(struct fc_disc *);
49static void fc_disc_gpn_ft_resp(struct fc_seq *, struct fc_frame *, void *); 47static void fc_disc_gpn_ft_resp(struct fc_seq *, struct fc_frame *, void *);
50static int fc_disc_new_target(struct fc_disc *, struct fc_rport_priv *, 48static int fc_disc_new_target(struct fc_disc *, struct fc_rport_priv *,
@@ -775,7 +773,6 @@ int fc_disc_init(struct fc_lport *lport)
775 INIT_LIST_HEAD(&disc->rports); 773 INIT_LIST_HEAD(&disc->rports);
776 774
777 disc->lport = lport; 775 disc->lport = lport;
778 disc->delay = FC_DISC_DELAY;
779 776
780 return 0; 777 return 0;
781} 778}
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index f3f320f1d399..093b0439a2cf 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -674,7 +674,6 @@ struct libfc_function_template {
674/* information used by the discovery layer */ 674/* information used by the discovery layer */
675struct fc_disc { 675struct fc_disc {
676 unsigned char retry_count; 676 unsigned char retry_count;
677 unsigned char delay;
678 unsigned char pending; 677 unsigned char pending;
679 unsigned char requested; 678 unsigned char requested;
680 unsigned short seq_count; 679 unsigned short seq_count;