Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69316ee2 authored by Joe Eykholt's avatar Joe Eykholt Committed by James Bottomley
Browse files

[SCSI] libfcoe: update FIP FCF announcements 



Move the announcement code to a separate function for reuse in
a forthcoming patch.

For messages regarding FCF timeout and selection, use the
previously-announced FCF MAC address (dest_addr) in the fcoe_ctlr struct.
Only print (announce) the FCF if it is new.   Print MAC for
timed-out or deselected FCFs.

Signed-off-by: default avatarJoe Eykholt <jeykholt@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent b5fe5e95

drivers/scsi/fcoe/libfcoe.c

+29 −11
Original line number Original line Diff line number Diff line
@@ -230,6 +230,33 @@ void fcoe_ctlr_destroy(struct fcoe_ctlr *fip) 
}

}

EXPORT_SYMBOL(fcoe_ctlr_destroy);

EXPORT_SYMBOL(fcoe_ctlr_destroy);





/**

 * fcoe_ctlr_announce() - announce new selection

 * @fip: The FCoE controller

 *

 * Also sets the destination MAC for FCoE and control packets

 */

static void fcoe_ctlr_announce(struct fcoe_ctlr *fip)

{

	struct fcoe_fcf *sel = fip->sel_fcf;



	if (sel && !compare_ether_addr(sel->fcf_mac, fip->dest_addr))

		return;

	if (!is_zero_ether_addr(fip->dest_addr)) {

		printk(KERN_NOTICE "libfcoe: host%d: "

		       "FIP Fibre-Channel Forwarder MAC %pM deselected\n",

		       fip->lp->host->host_no, fip->dest_addr);

		memset(fip->dest_addr, 0, ETH_ALEN);

	}

	if (sel) {

		printk(KERN_INFO "libfcoe: host%d: FIP selected "

		       "Fibre-Channel Forwarder MAC %pM\n",

		       fip->lp->host->host_no, sel->fcf_mac);

		memcpy(fip->dest_addr, sel->fcf_mac, ETH_ALEN);

		fip->map_dest = 0;

	}

}



/**

/**

 * fcoe_ctlr_fcoe_size() - Return the maximum FCoE size required for VN_Port

 * fcoe_ctlr_fcoe_size() - Return the maximum FCoE size required for VN_Port

 * @fip: The FCoE controller to get the maximum FCoE size from

 * @fip: The FCoE controller to get the maximum FCoE size from
@@ -1420,25 +1447,16 @@ static void fcoe_ctlr_timer_work(struct work_struct *work) 




	if (sel != fcf) {

	if (sel != fcf) {

		fcf = sel;		/* the old FCF may have been freed */

		fcf = sel;		/* the old FCF may have been freed */

		fcoe_ctlr_announce(fip);

		if (sel) {

		if (sel) {

			printk(KERN_INFO "libfcoe: host%d: FIP selected "

			       "Fibre-Channel Forwarder MAC %pM\n",

			       fip->lp->host->host_no, sel->fcf_mac);

			memcpy(fip->dest_addr, sel->fcf_mac, ETH_ALEN);

			fip->map_dest = 0;

			fip->port_ka_time = jiffies +

			fip->port_ka_time = jiffies +

				msecs_to_jiffies(FIP_VN_KA_PERIOD);

				msecs_to_jiffies(FIP_VN_KA_PERIOD);

			fip->ctlr_ka_time = jiffies + sel->fka_period;

			fip->ctlr_ka_time = jiffies + sel->fka_period;

			if (time_after(next_timer, fip->ctlr_ka_time))

			if (time_after(next_timer, fip->ctlr_ka_time))

				next_timer = fip->ctlr_ka_time;

				next_timer = fip->ctlr_ka_time;

		} else {

		} else

			printk(KERN_NOTICE "libfcoe: host%d: "

			       "FIP Fibre-Channel Forwarder timed out.	"

			       "Starting FCF discovery.\n",

			       fip->lp->host->host_no);

			reset = 1;

			reset = 1;

	}

	}

	}





	if (sel && !sel->fd_flags) {

	if (sel && !sel->fd_flags) {

		if (time_after_eq(jiffies, fip->ctlr_ka_time)) {

		if (time_after_eq(jiffies, fip->ctlr_ka_time)) {