mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-15 16:16:56 +07:00
Staging: agnx: replace print_mac with %pM
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
5e436d09ce
commit
c2c5be8b58
@ -312,7 +312,6 @@ static inline void dump_ieee80211_hdr(struct ieee80211_hdr *hdr, char *tag)
|
||||
{
|
||||
u16 fctl;
|
||||
int hdrlen;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
fctl = le16_to_cpu(hdr->frame_control);
|
||||
switch (fctl & IEEE80211_FCTL_FTYPE) {
|
||||
@ -375,13 +374,13 @@ static inline void dump_ieee80211_hdr(struct ieee80211_hdr *hdr, char *tag)
|
||||
printk("FC=0x%04x DUR=0x%04x",
|
||||
fctl, le16_to_cpu(hdr->duration_id));
|
||||
if (hdrlen >= 10)
|
||||
printk(" A1=%s", print_mac(mac, hdr->addr1));
|
||||
printk(" A1=%pM", hdr->addr1);
|
||||
if (hdrlen >= 16)
|
||||
printk(" A2=%s", print_mac(mac, hdr->addr2));
|
||||
printk(" A2=%pM", hdr->addr2);
|
||||
if (hdrlen >= 24)
|
||||
printk(" A3=%s", print_mac(mac, hdr->addr3));
|
||||
printk(" A3=%pM", hdr->addr3);
|
||||
if (hdrlen >= 30)
|
||||
printk(" A4=%s", print_mac(mac, hdr->addr4));
|
||||
printk(" A4=%pM", hdr->addr4);
|
||||
printk("\n");
|
||||
}
|
||||
|
||||
|
@ -150,8 +150,7 @@ static int agnx_get_mac_address(struct agnx_priv *priv)
|
||||
*((u32 *)(priv->mac_addr + 2)) = cpu_to_le32(reg);
|
||||
|
||||
if (!is_valid_ether_addr(priv->mac_addr)) {
|
||||
DECLARE_MAC_BUF(mbuf);
|
||||
printk(KERN_WARNING PFX "read mac %s\n", print_mac(mbuf, priv->mac_addr));
|
||||
printk(KERN_WARNING PFX "read mac %pM\n", priv->mac_addr);
|
||||
printk(KERN_WARNING PFX "Invalid hwaddr! Using random hwaddr\n");
|
||||
random_ether_addr(priv->mac_addr);
|
||||
}
|
||||
@ -456,7 +455,6 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,
|
||||
struct ieee80211_hw *dev;
|
||||
struct agnx_priv *priv;
|
||||
int err;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
err = pci_enable_device(pdev);
|
||||
if (err) {
|
||||
@ -550,9 +548,9 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,
|
||||
|
||||
agnx_hw_reset(priv);
|
||||
|
||||
dev_info(&pdev->dev, "%s: hwaddr %s, Rev 0x%02x\n",
|
||||
dev_info(&pdev->dev, "%s: hwaddr %pM, Rev 0x%02x\n",
|
||||
wiphy_name(dev->wiphy),
|
||||
print_mac(mac, dev->wiphy->perm_addr), priv->revid);
|
||||
dev->wiphy->perm_addr, priv->revid);
|
||||
return 0;
|
||||
|
||||
err_iounmap:
|
||||
|
Loading…
Reference in New Issue
Block a user