Commit 90b3a938 authored by Karan Tilak Kumar's avatar Karan Tilak Kumar Committed by Martin K. Petersen
Browse files

scsi: fnic: Change shost_printk() to FNIC_FCS_DBG() 

Replacing shost_printk with FNIC_FCS_DBG() so that these log messages are
controlled by fnic_log_level flag in fnic_fip_handler_timer.

Bumping up version number from 47 to 49 to maintain same level as internal
version.

Link: https://lore.kernel.org/r/20201120220712.16708-1-kartilak@cisco.com


Reviewed-by: default avatarArulprabhu Ponnusamy <arulponn@cisco.com>
Co-developed-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarKaran Tilak Kumar <kartilak@cisco.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 89eddb40

drivers/scsi/fnic/fnic.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 


#define DRV_NAME		"fnic"

#define DRV_DESCRIPTION		"Cisco FCoE HBA Driver"

#define DRV_VERSION		"1.6.0.47"

#define DRV_VERSION		"1.6.0.49"

#define PFX			DRV_NAME ": "

#define DFX                     DRV_NAME "%d: "

drivers/scsi/fnic/fnic_fcs.c

+3 −3
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ void fnic_handle_fip_timer(struct fnic *fnic) 
	}



	vlan = list_first_entry(&fnic->vlans, struct fcoe_vlan, list);

	shost_printk(KERN_DEBUG, fnic->lport->host,

	FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host,

		  "fip_timer: vlan %d state %d sol_count %d\n",

		  vlan->vid, vlan->state, vlan->sol_count);

	switch (vlan->state) {
@@ -1372,7 +1372,7 @@ void fnic_handle_fip_timer(struct fnic *fnic) 
			 * no response on this vlan, remove  from the list.

			 * Try the next vlan

			 */

			shost_printk(KERN_INFO, fnic->lport->host,

			FNIC_FCS_DBG(KERN_INFO, fnic->lport->host,

				  "Dequeue this VLAN ID %d from list\n",

				  vlan->vid);

			list_del(&vlan->list);
@@ -1382,7 +1382,7 @@ void fnic_handle_fip_timer(struct fnic *fnic) 
				/* we exhausted all vlans, restart vlan disc */

				spin_unlock_irqrestore(&fnic->vlans_lock,

							flags);

				shost_printk(KERN_INFO, fnic->lport->host,

				FNIC_FCS_DBG(KERN_INFO, fnic->lport->host,

					  "fip_timer: vlan list empty, "

					  "trigger vlan disc\n");

				fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC);