lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

Browse Source 
This is nicer than the MAC_FMT stuff.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches
2007-10-03 17:59:30 -07:00
committed by David S. Miller
parent 95ea36275f
commit 0795af5729
228 changed files with 1876 additions and 1953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/net/wireless/wavelan.c
View File

@@ -880,6 +880,8 @@ static void wv_82586_reconfig(struct net_device * dev)
*/
static void wv_psa_show(psa_t * p)
{
DECLARE_MAC_BUF(mac);
printk(KERN_DEBUG "##### WaveLAN PSA contents: #####\n");
printk(KERN_DEBUG "psa_io_base_addr_1: 0x%02X %02X %02X %02X\n",
p->psa_io_base_addr_1,
@@ -891,22 +893,13 @@ static void wv_psa_show(psa_t * p)
printk(KERN_DEBUG "psa_holi_params: 0x%02x, ", p->psa_holi_params);
printk("psa_int_req_no: %d\n", p->psa_int_req_no);
#ifdef DEBUG_SHOW_UNUSED
printk(KERN_DEBUG
"psa_unused0[]: %02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
p->psa_unused0[0], p->psa_unused0[1], p->psa_unused0[2],
p->psa_unused0[3], p->psa_unused0[4], p->psa_unused0[5],
p->psa_unused0[6]);
printk(KERN_DEBUG "psa_unused0[]: %s\n",
print_mac(mac, p->psa_unused0));
#endif /* DEBUG_SHOW_UNUSED */
printk(KERN_DEBUG
"psa_univ_mac_addr[]: %02x:%02x:%02x:%02x:%02x:%02x\n",
p->psa_univ_mac_addr[0], p->psa_univ_mac_addr[1],
p->psa_univ_mac_addr[2], p->psa_univ_mac_addr[3],
p->psa_univ_mac_addr[4], p->psa_univ_mac_addr[5]);
printk(KERN_DEBUG
"psa_local_mac_addr[]: %02x:%02x:%02x:%02x:%02x:%02x\n",
p->psa_local_mac_addr[0], p->psa_local_mac_addr[1],
p->psa_local_mac_addr[2], p->psa_local_mac_addr[3],
p->psa_local_mac_addr[4], p->psa_local_mac_addr[5]);
printk(KERN_DEBUG "psa_univ_mac_addr[]: %s\n",
print_mac(mac, p->psa_univ_mac_addr));
printk(KERN_DEBUG "psa_local_mac_addr[]: %s\n",
print_mac(mac, p->psa_local_mac_addr));
printk(KERN_DEBUG "psa_univ_local_sel: %d, ",
p->psa_univ_local_sel);
printk("psa_comp_number: %d, ", p->psa_comp_number);
@@ -1248,14 +1241,14 @@ static inline void wv_packet_info(u8 * p, /* Packet to dump */
{ /* Name of the function */
int i;
int maxi;
DECLARE_MAC_BUF(mac);
printk(KERN_DEBUG
"%s: %s(): dest %02X:%02X:%02X:%02X:%02X:%02X, length %d\n",
msg1, msg2, p[0], p[1], p[2], p[3], p[4], p[5], length);
"%s: %s(): dest %s, length %d\n",
msg1, msg2, print_mac(mac, p), length);
printk(KERN_DEBUG
"%s: %s(): src %02X:%02X:%02X:%02X:%02X:%02X, type 0x%02X%02X\n",
msg1, msg2, p[6], p[7], p[8], p[9], p[10], p[11], p[12],
p[13]);
"%s: %s(): src %s, type 0x%02X%02X\n",
msg1, msg2, print_mac(mac, &p[6]), p[12], p[13]);
#ifdef DEBUG_PACKET_DUMP
@@ -1286,7 +1279,9 @@ static void wv_init_info(struct net_device * dev)
short ioaddr = dev->base_addr;
net_local *lp = (net_local *) dev->priv;
psa_t psa;
int i;
#ifdef DEBUG_BASIC_SHOW
DECLARE_MAC_BUF(mac);
#endif
/* Read the parameter storage area */
psa_read(ioaddr, lp->hacr, 0, (unsigned char *) &psa, sizeof(psa));
@@ -1303,10 +1298,8 @@ static void wv_init_info(struct net_device * dev)
#ifdef DEBUG_BASIC_SHOW
/* Now, let's go for the basic stuff. */
printk(KERN_NOTICE "%s: WaveLAN at %#x,", dev->name, ioaddr);
for (i = 0; i < WAVELAN_ADDR_SIZE; i++)
printk("%s%02X", (i == 0) ? " " : ":", dev->dev_addr[i]);
printk(", IRQ %d", dev->irq);
printk(KERN_NOTICE "%s: WaveLAN at %#x, %s, IRQ %d",
dev->name, ioaddr, print_mac(mac, dev->dev_addr), dev->irq);
/* Print current network ID. */
if (psa.psa_nwid_select)
@@ -3596,15 +3589,15 @@ static void wv_82586_config(struct net_device * dev)
WAVELAN_ADDR_SIZE >> 1);
#ifdef DEBUG_CONFIG_INFO
{
DECLARE_MAC_BUF(mac);
printk(KERN_DEBUG
"%s: wv_82586_config(): set %d multicast addresses:\n",
dev->name, lp->mc_count);
for (dmi = dev->mc_list; dmi; dmi = dmi->next)
printk(KERN_DEBUG
" %02x:%02x:%02x:%02x:%02x:%02x\n",
dmi->dmi_addr[0], dmi->dmi_addr[1],
dmi->dmi_addr[2], dmi->dmi_addr[3],
dmi->dmi_addr[4], dmi->dmi_addr[5]);
printk(KERN_DEBUG " %s\n",
print_mac(mac, dmi->dmi_addr));
}
#endif
}