From c9a9e5e5db9a9e2ff9549f7dfaf49f6ecbfda38b Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 15 Jul 2009 17:21:14 +0200 Subject: [PATCH] --- yaml --- r: 160999 b: refs/heads/master c: 66d6faec2f874cf6bf9bd4900966584ea9feae3d h: refs/heads/master i: 160997: 6058499d69d63cd2e56a6650d99ead537860b978 160995: d750641ee7d0edfc9f85aa4d156d7b8694e94dd0 160991: 291081f296bad97f3bdfeb81a8b8591862bf83b7 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/fcoe/libfcoe.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1802de8785f5..ae09cea45e66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e34ccdfe0e08a6acb8c5e649fef1e94e6cd637f9 +refs/heads/master: 66d6faec2f874cf6bf9bd4900966584ea9feae3d diff --git a/trunk/drivers/scsi/fcoe/libfcoe.c b/trunk/drivers/scsi/fcoe/libfcoe.c index f544340d318b..d6ed3f8255ad 100644 --- a/trunk/drivers/scsi/fcoe/libfcoe.c +++ b/trunk/drivers/scsi/fcoe/libfcoe.c @@ -1104,7 +1104,6 @@ static void fcoe_ctlr_timeout(unsigned long arg) struct fcoe_fcf *sel; struct fcoe_fcf *fcf; unsigned long next_timer = jiffies + msecs_to_jiffies(FIP_VN_KA_PERIOD); - DECLARE_MAC_BUF(buf); u8 send_ctlr_ka; u8 send_port_ka; @@ -1128,9 +1127,8 @@ static void fcoe_ctlr_timeout(unsigned long arg) fcf = sel; /* the old FCF may have been freed */ if (sel) { printk(KERN_INFO "libfcoe: host%d: FIP selected " - "Fibre-Channel Forwarder MAC %s\n", - fip->lp->host->host_no, - print_mac(buf, sel->fcf_mac)); + "Fibre-Channel Forwarder MAC %pM\n", + fip->lp->host->host_no, sel->fcf_mac); memcpy(fip->dest_addr, sel->fcf_mac, ETH_ALEN); fip->port_ka_time = jiffies + msecs_to_jiffies(FIP_VN_KA_PERIOD);