aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/fcoe/libfcoe.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index c90622c28b6c..dcccb0bf3170 100644
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -979,11 +979,9 @@ static void fcoe_ctlr_recv_adv(struct fcoe_ctlr *fip, struct sk_buff *skb)
979 } 979 }
980 mtu_valid = fcoe_ctlr_mtu_valid(fcf); 980 mtu_valid = fcoe_ctlr_mtu_valid(fcf);
981 fcf->time = jiffies; 981 fcf->time = jiffies;
982 if (!found) { 982 if (!found)
983 LIBFCOE_FIP_DBG(fip, "New FCF for fab %16.16llx " 983 LIBFCOE_FIP_DBG(fip, "New FCF fab %16.16llx mac %pM\n",
984 "map %x val %d\n", 984 fcf->fabric_name, fcf->fcf_mac);
985 fcf->fabric_name, fcf->fc_map, mtu_valid);
986 }
987 985
988 /* 986 /*
989 * If this advertisement is not solicited and our max receive size 987 * If this advertisement is not solicited and our max receive size
@@ -1405,10 +1403,12 @@ static void fcoe_ctlr_select(struct fcoe_ctlr *fip)
1405 first = list_first_entry(&fip->fcfs, struct fcoe_fcf, list); 1403 first = list_first_entry(&fip->fcfs, struct fcoe_fcf, list);
1406 1404
1407 list_for_each_entry(fcf, &fip->fcfs, list) { 1405 list_for_each_entry(fcf, &fip->fcfs, list) {
1408 LIBFCOE_FIP_DBG(fip, "consider FCF for fab %16.16llx " 1406 LIBFCOE_FIP_DBG(fip, "consider FCF fab %16.16llx "
1409 "VFID %d map %x val %d\n", 1407 "VFID %d mac %pM map %x val %d "
1410 fcf->fabric_name, fcf->vfid, 1408 "sent %u pri %u\n",
1411 fcf->fc_map, fcoe_ctlr_mtu_valid(fcf)); 1409 fcf->fabric_name, fcf->vfid, fcf->fcf_mac,
1410 fcf->fc_map, fcoe_ctlr_mtu_valid(fcf),
1411 fcf->flogi_sent, fcf->pri);
1412 if (fcf->fabric_name != first->fabric_name || 1412 if (fcf->fabric_name != first->fabric_name ||
1413 fcf->vfid != first->vfid || 1413 fcf->vfid != first->vfid ||
1414 fcf->fc_map != first->fc_map) { 1414 fcf->fc_map != first->fc_map) {
@@ -1432,6 +1432,7 @@ static void fcoe_ctlr_select(struct fcoe_ctlr *fip)
1432 } 1432 }
1433 fip->sel_fcf = best; 1433 fip->sel_fcf = best;
1434 if (best) { 1434 if (best) {
1435 LIBFCOE_FIP_DBG(fip, "using FCF mac %pM\n", best->fcf_mac);
1435 fip->port_ka_time = jiffies + 1436 fip->port_ka_time = jiffies +
1436 msecs_to_jiffies(FIP_VN_KA_PERIOD); 1437 msecs_to_jiffies(FIP_VN_KA_PERIOD);
1437 fip->ctlr_ka_time = jiffies + best->fka_period; 1438 fip->ctlr_ka_time = jiffies + best->fka_period;