aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-07-15 11:21:14 -0400
committerJames Bottomley <James.Bottomley@suse.de>2009-08-22 18:51:56 -0400
commit66d6faec2f874cf6bf9bd4900966584ea9feae3d (patch)
tree5095275a5e2d4eb237275f07e1f5f141dbe62ea0
parente34ccdfe0e08a6acb8c5e649fef1e94e6cd637f9 (diff)
[SCSI] fcoe: convert to %pM
print_mac is being deprecated, and %pM makes for smaller code anyway. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Robert Love <robert.w.love@intel.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
-rw-r--r--drivers/scsi/fcoe/libfcoe.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index f544340d318b..d6ed3f8255ad 100644
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -1104,7 +1104,6 @@ static void fcoe_ctlr_timeout(unsigned long arg)
1104 struct fcoe_fcf *sel; 1104 struct fcoe_fcf *sel;
1105 struct fcoe_fcf *fcf; 1105 struct fcoe_fcf *fcf;
1106 unsigned long next_timer = jiffies + msecs_to_jiffies(FIP_VN_KA_PERIOD); 1106 unsigned long next_timer = jiffies + msecs_to_jiffies(FIP_VN_KA_PERIOD);
1107 DECLARE_MAC_BUF(buf);
1108 u8 send_ctlr_ka; 1107 u8 send_ctlr_ka;
1109 u8 send_port_ka; 1108 u8 send_port_ka;
1110 1109
@@ -1128,9 +1127,8 @@ static void fcoe_ctlr_timeout(unsigned long arg)
1128 fcf = sel; /* the old FCF may have been freed */ 1127 fcf = sel; /* the old FCF may have been freed */
1129 if (sel) { 1128 if (sel) {
1130 printk(KERN_INFO "libfcoe: host%d: FIP selected " 1129 printk(KERN_INFO "libfcoe: host%d: FIP selected "
1131 "Fibre-Channel Forwarder MAC %s\n", 1130 "Fibre-Channel Forwarder MAC %pM\n",
1132 fip->lp->host->host_no, 1131 fip->lp->host->host_no, sel->fcf_mac);
1133 print_mac(buf, sel->fcf_mac));
1134 memcpy(fip->dest_addr, sel->fcf_mac, ETH_ALEN); 1132 memcpy(fip->dest_addr, sel->fcf_mac, ETH_ALEN);
1135 fip->port_ka_time = jiffies + 1133 fip->port_ka_time = jiffies +
1136 msecs_to_jiffies(FIP_VN_KA_PERIOD); 1134 msecs_to_jiffies(FIP_VN_KA_PERIOD);