aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptlan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message/fusion/mptlan.c')
-rw-r--r--drivers/message/fusion/mptlan.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index a1abf95cf751..582a921c7aab 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -1462,11 +1462,9 @@ mptlan_probe(struct pci_dev *pdev, const struct pci_device_id *id)
1462 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device " 1462 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device "
1463 "registered as '%s'\n", ioc->name, dev->name); 1463 "registered as '%s'\n", ioc->name, dev->name);
1464 printk(KERN_INFO MYNAM ": %s/%s: " 1464 printk(KERN_INFO MYNAM ": %s/%s: "
1465 "LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n", 1465 "LanAddr = %pM\n",
1466 IOC_AND_NETDEV_NAMES_s_s(dev), 1466 IOC_AND_NETDEV_NAMES_s_s(dev),
1467 dev->dev_addr[0], dev->dev_addr[1], 1467 dev->dev_addr);
1468 dev->dev_addr[2], dev->dev_addr[3],
1469 dev->dev_addr[4], dev->dev_addr[5]);
1470 1468
1471 ioc->netdev = dev; 1469 ioc->netdev = dev;
1472 1470
@@ -1551,9 +1549,8 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
1551 1549
1552 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n", 1550 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n",
1553 NETDEV_PTR_TO_IOC_NAME_s(dev)); 1551 NETDEV_PTR_TO_IOC_NAME_s(dev));
1554 printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %02x:%02x:%02x:%02x:%02x:%02x\n", 1552 printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %pM\n",
1555 fch->saddr[0], fch->saddr[1], fch->saddr[2], 1553 fch->saddr);
1556 fch->saddr[3], fch->saddr[4], fch->saddr[5]);
1557 } 1554 }
1558 1555
1559 if (*fch->daddr & 1) { 1556 if (*fch->daddr & 1) {
@@ -1628,10 +1625,9 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
1628 nh->NAA = source_naa; /* Set the S_NAA value. */ 1625 nh->NAA = source_naa; /* Set the S_NAA value. */
1629 for (i = 0; i < FC_ALEN; i++) 1626 for (i = 0; i < FC_ALEN; i++)
1630 nh->ieee[i] = fch->saddr[i]; 1627 nh->ieee[i] = fch->saddr[i];
1631 dlprintk ((KERN_INFO "Got ARP from %02x:%02x:%02x:%02x:" 1628 dlprintk ((KERN_INFO "Got ARP from %pM with"
1632 "%02x:%02x with non-compliant S_NAA value.\n", 1629 " non-compliant S_NAA value.\n",
1633 fch->saddr[0], fch->saddr[1], fch->saddr[2], 1630 fch->saddr));
1634 fch->saddr[3], fch->saddr[4],fch->saddr[5]));
1635 } else { 1631 } else {
1636 printk (KERN_ERR "mptlan/type_trans: Unable to" 1632 printk (KERN_ERR "mptlan/type_trans: Unable to"
1637 " kmalloc a NAA_Hosed struct.\n"); 1633 " kmalloc a NAA_Hosed struct.\n");