Commit b43abcbb authored by Satish Kharat's avatar Satish Kharat Committed by Martin K. Petersen
Browse files

scsi: fnic: Ratelimit printks to avoid flooding when vlan is not set by the switch.i 



This is to avoid the log from being filled with vlan discovery messages
when there is no vlan configured on the switch.

Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarSesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent cca678df

drivers/scsi/fnic/fnic_fcs.c

+13 −8
Original line number Original line Diff line number Diff line
@@ -342,8 +342,11 @@ static void fnic_fcoe_send_vlan_req(struct fnic *fnic) 




	fnic_fcoe_reset_vlans(fnic);

	fnic_fcoe_reset_vlans(fnic);

	fnic->set_vlan(fnic, 0);

	fnic->set_vlan(fnic, 0);



	if (printk_ratelimit())

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

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

			  "Sending VLAN request...\n");

			  "Sending VLAN request...\n");



	skb = dev_alloc_skb(sizeof(struct fip_vlan));

	skb = dev_alloc_skb(sizeof(struct fip_vlan));

	if (!skb)

	if (!skb)

		return;

		return;
@@ -1313,10 +1316,11 @@ void fnic_handle_fip_timer(struct fnic *fnic) 




	spin_lock_irqsave(&fnic->vlans_lock, flags);

	spin_lock_irqsave(&fnic->vlans_lock, flags);

	if (list_empty(&fnic->vlans)) {

	if (list_empty(&fnic->vlans)) {

		spin_unlock_irqrestore(&fnic->vlans_lock, flags);

		/* no vlans available, try again */

		/* no vlans available, try again */

		if (printk_ratelimit())

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

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

				  "Start VLAN Discovery\n");

				  "Start VLAN Discovery\n");

		spin_unlock_irqrestore(&fnic->vlans_lock, flags);

		fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC);

		fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC);

		return;

		return;

	}

	}
@@ -1332,10 +1336,11 @@ void fnic_handle_fip_timer(struct fnic *fnic) 
		spin_unlock_irqrestore(&fnic->vlans_lock, flags);

		spin_unlock_irqrestore(&fnic->vlans_lock, flags);

		break;

		break;

	case FIP_VLAN_FAILED:

	case FIP_VLAN_FAILED:

		spin_unlock_irqrestore(&fnic->vlans_lock, flags);

		/* if all vlans are in failed state, restart vlan disc */

		/* if all vlans are in failed state, restart vlan disc */

		if (printk_ratelimit())

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

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

				  "Start VLAN Discovery\n");

				  "Start VLAN Discovery\n");

		spin_unlock_irqrestore(&fnic->vlans_lock, flags);

		fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC);

		fnic_event_enq(fnic, FNIC_EVT_START_VLAN_DISC);

		break;

		break;

	case FIP_VLAN_SENT:

	case FIP_VLAN_SENT: