net: convert more to %pM
A number of places still use %02x:...:%02x because it's in debug statements or for no real reason. Make a few of them use %pM. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
e174961ca1
Коммит
7c510e4b73
|
@ -42,8 +42,5 @@ void __init idprom_init(void)
|
|||
idprom->id_cksum, calc_idprom_cksum(idprom));
|
||||
}
|
||||
|
||||
printk("Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
idprom->id_ethaddr[0], idprom->id_ethaddr[1],
|
||||
idprom->id_ethaddr[2], idprom->id_ethaddr[3],
|
||||
idprom->id_ethaddr[4], idprom->id_ethaddr[5]);
|
||||
printk("Ethernet address: %pM\n", idprom->id_ethaddr);
|
||||
}
|
||||
|
|
|
@ -418,12 +418,7 @@ static void eth_configure(int n, void *init, char *mac,
|
|||
|
||||
setup_etheraddr(mac, device->mac, dev->name);
|
||||
|
||||
printk(KERN_INFO "Netdevice %d ", n);
|
||||
printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
|
||||
device->mac[0], device->mac[1],
|
||||
device->mac[2], device->mac[3],
|
||||
device->mac[4], device->mac[5]);
|
||||
printk(": ");
|
||||
printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);
|
||||
|
||||
lp = dev->priv;
|
||||
/* This points to the transport private data. It's still clear, but we
|
||||
|
|
|
@ -660,10 +660,7 @@ static int iss_net_configure(int index, char *init)
|
|||
|
||||
printk(KERN_INFO "Netdevice %d ", index);
|
||||
if (lp->have_mac)
|
||||
printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
|
||||
lp->mac[0], lp->mac[1],
|
||||
lp->mac[2], lp->mac[3],
|
||||
lp->mac[4], lp->mac[5]);
|
||||
printk("(%pM) ", lp->mac);
|
||||
printk(": ");
|
||||
|
||||
/* sysfs register */
|
||||
|
|
|
@ -270,7 +270,7 @@ int flexcop_device_initialize(struct flexcop_device *fc)
|
|||
/* do the MAC address reading after initializing the dvb_adapter */
|
||||
if (fc->get_mac_addr(fc, 0) == 0) {
|
||||
u8 *b = fc->dvb_adapter.proposed_mac;
|
||||
info("MAC address = %02x:%02x:%02x:%02x:%02x:%02x", b[0],b[1],b[2],b[3],b[4],b[5]);
|
||||
info("MAC address = %pM", b);
|
||||
flexcop_set_mac_filter(fc,b);
|
||||
flexcop_mac_filter_ctrl(fc,1);
|
||||
} else
|
||||
|
|
|
@ -917,9 +917,7 @@ static int dst_get_mac(struct dst_state *state)
|
|||
}
|
||||
memset(&state->mac_address, '\0', 8);
|
||||
memcpy(&state->mac_address, &state->rxbuffer, 6);
|
||||
dprintk(verbose, DST_ERROR, 1, "MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]",
|
||||
state->mac_address[0], state->mac_address[1], state->mac_address[2],
|
||||
state->mac_address[4], state->mac_address[5], state->mac_address[6]);
|
||||
dprintk(verbose, DST_ERROR, 1, "MAC Address=[%pM]", state->mac_address);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -697,8 +697,7 @@ static void __devinit dm1105dvb_read_mac(struct dm1105dvb *dm1105dvb, u8 *mac)
|
|||
};
|
||||
|
||||
dm1105_i2c_xfer(&dm1105dvb->i2c_adap, msg , 2);
|
||||
dev_info(&dm1105dvb->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
|
||||
dev_info(&dm1105dvb->pdev->dev, "MAC %pM\n", mac);
|
||||
}
|
||||
|
||||
static int __devinit dm1105_probe(struct pci_dev *pdev,
|
||||
|
|
|
@ -91,10 +91,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
|
|||
|
||||
if (adap->dev->props.read_mac_address) {
|
||||
if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)
|
||||
info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",adap->dvb_adap.proposed_mac[0],
|
||||
adap->dvb_adap.proposed_mac[1], adap->dvb_adap.proposed_mac[2],
|
||||
adap->dvb_adap.proposed_mac[3], adap->dvb_adap.proposed_mac[4],
|
||||
adap->dvb_adap.proposed_mac[5]);
|
||||
info("MAC address: %pM",adap->dvb_adap.proposed_mac);
|
||||
else
|
||||
err("MAC address reading failed.");
|
||||
}
|
||||
|
|
|
@ -560,8 +560,7 @@ static void __devinit pluto_read_mac(struct pluto *pluto, u8 *mac)
|
|||
mac[4] = (val >> 8) & 0xff;
|
||||
mac[5] = (val >> 0) & 0xff;
|
||||
|
||||
dev_info(&pluto->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
|
||||
dev_info(&pluto->pdev->dev, "MAC %pM\n", mac);
|
||||
}
|
||||
|
||||
static int __devinit pluto_read_serial(struct pluto *pluto)
|
||||
|
|
|
@ -1462,11 +1462,9 @@ mptlan_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device "
|
||||
"registered as '%s'\n", ioc->name, dev->name);
|
||||
printk(KERN_INFO MYNAM ": %s/%s: "
|
||||
"LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n",
|
||||
"LanAddr = %pM\n",
|
||||
IOC_AND_NETDEV_NAMES_s_s(dev),
|
||||
dev->dev_addr[0], dev->dev_addr[1],
|
||||
dev->dev_addr[2], dev->dev_addr[3],
|
||||
dev->dev_addr[4], dev->dev_addr[5]);
|
||||
dev->dev_addr);
|
||||
|
||||
ioc->netdev = dev;
|
||||
|
||||
|
@ -1551,9 +1549,8 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
|
|||
|
||||
printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n",
|
||||
NETDEV_PTR_TO_IOC_NAME_s(dev));
|
||||
printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
fch->saddr[0], fch->saddr[1], fch->saddr[2],
|
||||
fch->saddr[3], fch->saddr[4], fch->saddr[5]);
|
||||
printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %pM\n",
|
||||
fch->saddr);
|
||||
}
|
||||
|
||||
if (*fch->daddr & 1) {
|
||||
|
@ -1628,10 +1625,9 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
|
|||
nh->NAA = source_naa; /* Set the S_NAA value. */
|
||||
for (i = 0; i < FC_ALEN; i++)
|
||||
nh->ieee[i] = fch->saddr[i];
|
||||
dlprintk ((KERN_INFO "Got ARP from %02x:%02x:%02x:%02x:"
|
||||
"%02x:%02x with non-compliant S_NAA value.\n",
|
||||
fch->saddr[0], fch->saddr[1], fch->saddr[2],
|
||||
fch->saddr[3], fch->saddr[4],fch->saddr[5]));
|
||||
dlprintk ((KERN_INFO "Got ARP from %pM with"
|
||||
" non-compliant S_NAA value.\n",
|
||||
fch->saddr));
|
||||
} else {
|
||||
printk (KERN_ERR "mptlan/type_trans: Unable to"
|
||||
" kmalloc a NAA_Hosed struct.\n");
|
||||
|
|
|
@ -9851,11 +9851,8 @@ static void bnx2x_set_rx_mode(struct net_device *dev)
|
|||
mclist && (i < dev->mc_count);
|
||||
i++, mclist = mclist->next) {
|
||||
|
||||
DP(NETIF_MSG_IFUP, "Adding mcast MAC: "
|
||||
"%02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
mclist->dmi_addr[0], mclist->dmi_addr[1],
|
||||
mclist->dmi_addr[2], mclist->dmi_addr[3],
|
||||
mclist->dmi_addr[4], mclist->dmi_addr[5]);
|
||||
DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
|
||||
mclist->dmi_addr);
|
||||
|
||||
crc = crc32c_le(0, mclist->dmi_addr, ETH_ALEN);
|
||||
bit = (crc >> 24) & 0xff;
|
||||
|
|
|
@ -875,10 +875,7 @@ struct net_device * __init de620_probe(int unit)
|
|||
if (de620_debug) {
|
||||
printk("\nEEPROM contents:\n");
|
||||
printk("RAM_Size = 0x%02X\n", nic_data.RAM_Size);
|
||||
printk("NodeID = %02X:%02X:%02X:%02X:%02X:%02X\n",
|
||||
nic_data.NodeID[0], nic_data.NodeID[1],
|
||||
nic_data.NodeID[2], nic_data.NodeID[3],
|
||||
nic_data.NodeID[4], nic_data.NodeID[5]);
|
||||
printk("NodeID = %pM\n", nic_data.NodeID);
|
||||
printk("Model = %d\n", nic_data.Model);
|
||||
printk("Media = %d\n", nic_data.Media);
|
||||
printk("SCR = 0x%02x\n", nic_data.SCR);
|
||||
|
|
|
@ -4652,14 +4652,12 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
|
|||
u32 pba_num;
|
||||
|
||||
/* print bus type/speed/width info */
|
||||
e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
e_info("(PCI Express:2.5GB/s:%s) %pM\n",
|
||||
/* bus width */
|
||||
((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
|
||||
"Width x1"),
|
||||
/* MAC address */
|
||||
netdev->dev_addr[0], netdev->dev_addr[1],
|
||||
netdev->dev_addr[2], netdev->dev_addr[3],
|
||||
netdev->dev_addr[4], netdev->dev_addr[5]);
|
||||
netdev->dev_addr);
|
||||
e_info("Intel(R) PRO/%s Network Connection\n",
|
||||
(hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");
|
||||
e1000e_read_pba_num(hw, &pba_num);
|
||||
|
@ -4906,10 +4904,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
|
|||
memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
|
||||
|
||||
if (!is_valid_ether_addr(netdev->perm_addr)) {
|
||||
e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
netdev->perm_addr[0], netdev->perm_addr[1],
|
||||
netdev->perm_addr[2], netdev->perm_addr[3],
|
||||
netdev->perm_addr[4], netdev->perm_addr[5]);
|
||||
e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
|
||||
err = -EIO;
|
||||
goto err_eeprom;
|
||||
}
|
||||
|
|
|
@ -90,11 +90,8 @@ int enic_get_vnic_config(struct enic *enic)
|
|||
|
||||
c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer);
|
||||
|
||||
printk(KERN_INFO PFX "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x "
|
||||
"wq/rq %d/%d\n",
|
||||
enic->mac_addr[0], enic->mac_addr[1], enic->mac_addr[2],
|
||||
enic->mac_addr[3], enic->mac_addr[4], enic->mac_addr[5],
|
||||
c->wq_desc_count, c->rq_desc_count);
|
||||
printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n",
|
||||
enic->mac_addr, c->wq_desc_count, c->rq_desc_count);
|
||||
printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d "
|
||||
"intr timer %d\n",
|
||||
c->mtu, ENIC_SETTING(enic, TXCSUM),
|
||||
|
|
|
@ -489,10 +489,7 @@ void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
|
|||
|
||||
err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
|
||||
if (err)
|
||||
printk(KERN_ERR
|
||||
"Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
|
||||
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
|
||||
err);
|
||||
printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err);
|
||||
}
|
||||
|
||||
void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
|
||||
|
@ -507,10 +504,7 @@ void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
|
|||
|
||||
err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
|
||||
if (err)
|
||||
printk(KERN_ERR
|
||||
"Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
|
||||
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
|
||||
err);
|
||||
printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);
|
||||
}
|
||||
|
||||
int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
|
||||
|
|
|
@ -1115,10 +1115,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
|
|||
if (ret)
|
||||
goto out_free_bd;
|
||||
|
||||
printk(KERN_INFO "%s: fs_enet: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
ndev->name,
|
||||
ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
|
||||
ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
|
||||
printk(KERN_INFO "%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -396,9 +396,7 @@ static void emac_hash_mc(struct emac_instance *dev)
|
|||
|
||||
for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) {
|
||||
int slot, reg, mask;
|
||||
DBG2(dev, "mc %02x:%02x:%02x:%02x:%02x:%02x" NL,
|
||||
dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
|
||||
dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
|
||||
DBG2(dev, "mc %pM" NL, dmi->dmi_addr);
|
||||
|
||||
slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr));
|
||||
reg = EMAC_XAHT_SLOT_TO_REG(dev, slot);
|
||||
|
@ -2865,11 +2863,8 @@ static int __devinit emac_probe(struct of_device *ofdev,
|
|||
wake_up_all(&emac_probe_wait);
|
||||
|
||||
|
||||
printk(KERN_INFO
|
||||
"%s: EMAC-%d %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
ndev->name, dev->cell_index, np->full_name,
|
||||
ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
|
||||
ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
|
||||
printk(KERN_INFO "%s: EMAC-%d %s, MAC %pM\n",
|
||||
ndev->name, dev->cell_index, np->full_name, ndev->dev_addr);
|
||||
|
||||
if (dev->phy_mode == PHY_MODE_SGMII)
|
||||
printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name);
|
||||
|
|
|
@ -1275,16 +1275,14 @@ static int __devinit igb_probe(struct pci_dev *pdev,
|
|||
|
||||
dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
|
||||
/* print bus type/speed/width info */
|
||||
dev_info(&pdev->dev,
|
||||
"%s: (PCIe:%s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
|
||||
netdev->name,
|
||||
((hw->bus.speed == e1000_bus_speed_2500)
|
||||
? "2.5Gb/s" : "unknown"),
|
||||
((hw->bus.width == e1000_bus_width_pcie_x4)
|
||||
? "Width x4" : (hw->bus.width == e1000_bus_width_pcie_x1)
|
||||
? "Width x1" : "unknown"),
|
||||
netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
|
||||
netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
|
||||
netdev->dev_addr);
|
||||
|
||||
igb_read_part_num(hw, &part_num);
|
||||
dev_info(&pdev->dev, "%s: PBA No: %06x-%03x\n", netdev->name,
|
||||
|
|
|
@ -390,11 +390,8 @@ static int nic_init(struct ioc3 *ioc3)
|
|||
}
|
||||
|
||||
printk("Found %s NIC", type);
|
||||
if (type != unknown) {
|
||||
printk (" registration number %02x:%02x:%02x:%02x:%02x:%02x,"
|
||||
" CRC %02x", serial[0], serial[1], serial[2],
|
||||
serial[3], serial[4], serial[5], crc);
|
||||
}
|
||||
if (type != unknown)
|
||||
printk (" registration number %pM, CRC %02x", serial, crc);
|
||||
printk(".\n");
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -3877,8 +3877,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
|
|||
pci_read_config_word(pdev, IXGBE_PCI_LINK_STATUS, &link_status);
|
||||
link_speed = link_status & IXGBE_PCI_LINK_SPEED;
|
||||
link_width = link_status & IXGBE_PCI_LINK_WIDTH;
|
||||
dev_info(&pdev->dev, "(PCI Express:%s:%s) "
|
||||
"%02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
dev_info(&pdev->dev, "(PCI Express:%s:%s) %pM\n",
|
||||
((link_speed == IXGBE_PCI_LINK_SPEED_5000) ? "5.0Gb/s" :
|
||||
(link_speed == IXGBE_PCI_LINK_SPEED_2500) ? "2.5Gb/s" :
|
||||
"Unknown"),
|
||||
|
@ -3887,8 +3886,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
|
|||
(link_width == IXGBE_PCI_LINK_WIDTH_2) ? "Width x2" :
|
||||
(link_width == IXGBE_PCI_LINK_WIDTH_1) ? "Width x1" :
|
||||
"Unknown"),
|
||||
netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
|
||||
netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
|
||||
netdev->dev_addr);
|
||||
ixgbe_read_pba_num_generic(hw, &part_num);
|
||||
dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
|
||||
hw->mac.type, hw->phy.type,
|
||||
|
|
|
@ -2862,18 +2862,10 @@ jme_init_one(struct pci_dev *pdev,
|
|||
goto err_out_free_shadow;
|
||||
}
|
||||
|
||||
msg_probe(jme,
|
||||
"JMC250 gigabit%s ver:%x rev:%x "
|
||||
"macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n",
|
||||
(jme->fpgaver != 0) ? " (FPGA)" : "",
|
||||
(jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev,
|
||||
jme->rev,
|
||||
netdev->dev_addr[0],
|
||||
netdev->dev_addr[1],
|
||||
netdev->dev_addr[2],
|
||||
netdev->dev_addr[3],
|
||||
netdev->dev_addr[4],
|
||||
netdev->dev_addr[5]);
|
||||
jme->rev, netdev->dev_addr);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -1165,11 +1165,7 @@ static int gelic_wl_set_ap(struct net_device *netdev,
|
|||
ETH_ALEN);
|
||||
set_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
|
||||
set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
|
||||
pr_debug("%s: bss=%02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
__func__,
|
||||
wl->bssid[0], wl->bssid[1],
|
||||
wl->bssid[2], wl->bssid[3],
|
||||
wl->bssid[4], wl->bssid[5]);
|
||||
pr_debug("%s: bss=%pM\n", __func__, wl->bssid);
|
||||
} else {
|
||||
pr_debug("%s: clear bssid\n", __func__);
|
||||
clear_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
|
||||
|
|
|
@ -336,12 +336,11 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
|
|||
(addr[5]);
|
||||
|
||||
QPRINTK(qdev, IFUP, INFO,
|
||||
"Adding %s address %02x:%02x:%02x:%02x:%02x:%02x"
|
||||
"Adding %s address %pM"
|
||||
" at index %d in the CAM.\n",
|
||||
((type ==
|
||||
MAC_ADDR_TYPE_MULTI_MAC) ? "MULTICAST" :
|
||||
"UNICAST"), addr[0], addr[1], addr[2], addr[3],
|
||||
addr[4], addr[5], index);
|
||||
"UNICAST"), addr, index);
|
||||
|
||||
status =
|
||||
ql_wait_reg_rdy(qdev,
|
||||
|
@ -3127,11 +3126,7 @@ static void ql_display_dev_info(struct net_device *ndev)
|
|||
qdev->chip_rev_id >> 4 & 0x0000000f,
|
||||
qdev->chip_rev_id >> 8 & 0x0000000f,
|
||||
qdev->chip_rev_id >> 12 & 0x0000000f);
|
||||
QPRINTK(qdev, PROBE, INFO,
|
||||
"MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
ndev->dev_addr[0], ndev->dev_addr[1],
|
||||
ndev->dev_addr[2], ndev->dev_addr[3], ndev->dev_addr[4],
|
||||
ndev->dev_addr[5]);
|
||||
QPRINTK(qdev, PROBE, INFO, "MAC address %pM\n", ndev->dev_addr);
|
||||
}
|
||||
|
||||
static int ql_adapter_down(struct ql_adapter *qdev)
|
||||
|
|
|
@ -2235,13 +2235,7 @@ static int wavelan_set_wap(struct net_device *dev,
|
|||
char *extra)
|
||||
{
|
||||
#ifdef DEBUG_IOCTL_INFO
|
||||
printk(KERN_DEBUG "Set AP to : %02X:%02X:%02X:%02X:%02X:%02X\n",
|
||||
wrqu->ap_addr.sa_data[0],
|
||||
wrqu->ap_addr.sa_data[1],
|
||||
wrqu->ap_addr.sa_data[2],
|
||||
wrqu->ap_addr.sa_data[3],
|
||||
wrqu->ap_addr.sa_data[4],
|
||||
wrqu->ap_addr.sa_data[5]);
|
||||
printk(KERN_DEBUG "Set AP to : %pM\n", wrqu->ap_addr.sa_data);
|
||||
#endif /* DEBUG_IOCTL_INFO */
|
||||
|
||||
return -EOPNOTSUPP;
|
||||
|
|
|
@ -131,17 +131,13 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
|
|||
mac = &cmd->data.setdelmac.mac[0];
|
||||
/* MAC already registered, needed in couple/uncouple case */
|
||||
if (cmd->hdr.return_code == 0x2005) {
|
||||
QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x "
|
||||
"already existing on %s \n",
|
||||
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
|
||||
QETH_CARD_IFNAME(card));
|
||||
QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",
|
||||
mac, QETH_CARD_IFNAME(card));
|
||||
cmd->hdr.return_code = 0;
|
||||
}
|
||||
if (cmd->hdr.return_code)
|
||||
QETH_DBF_MESSAGE(2, "Could not set group MAC "
|
||||
"%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
|
||||
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
|
||||
QETH_CARD_IFNAME(card), cmd->hdr.return_code);
|
||||
QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %x\n",
|
||||
mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -163,10 +159,8 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card,
|
|||
cmd = (struct qeth_ipa_cmd *) data;
|
||||
mac = &cmd->data.setdelmac.mac[0];
|
||||
if (cmd->hdr.return_code)
|
||||
QETH_DBF_MESSAGE(2, "Could not delete group MAC "
|
||||
"%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
|
||||
mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
|
||||
QETH_CARD_IFNAME(card), cmd->hdr.return_code);
|
||||
QETH_DBF_MESSAGE(2, "Could not delete group MAC %pM on %s: %x\n",
|
||||
mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -286,9 +286,7 @@ static ssize_t cxacru_sysfs_show_mac_address(struct device *dev,
|
|||
struct usbatm_data *usbatm_instance = usb_get_intfdata(intf);
|
||||
struct atm_dev *atm_dev = usbatm_instance->atm_dev;
|
||||
|
||||
return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
atm_dev->esi[0], atm_dev->esi[1], atm_dev->esi[2],
|
||||
atm_dev->esi[3], atm_dev->esi[4], atm_dev->esi[5]);
|
||||
return snprintf(buf, PAGE_SIZE, "%pM\n", atm_dev->esi);
|
||||
}
|
||||
|
||||
static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev,
|
||||
|
|
|
@ -770,10 +770,7 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
|
|||
return sprintf(page, "%s\n", instance->description);
|
||||
|
||||
if (!left--)
|
||||
return sprintf(page, "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
|
||||
atm_dev->esi[0], atm_dev->esi[1],
|
||||
atm_dev->esi[2], atm_dev->esi[3],
|
||||
atm_dev->esi[4], atm_dev->esi[5]);
|
||||
return sprintf(page, "MAC: %pM\n", atm_dev->esi);
|
||||
|
||||
if (!left--)
|
||||
return sprintf(page,
|
||||
|
|
Загрузка…
Ссылка в новой задаче