aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/82596.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/82596.c')
-rw-r--r--drivers/net/82596.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 6b03416731de..bb30d5be7824 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1116,15 +1116,12 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
1116 1116
1117static void print_eth(unsigned char *add, char *str) 1117static void print_eth(unsigned char *add, char *str)
1118{ 1118{
1119 int i; 1119 DECLARE_MAC_BUF(mac);
1120 DECLARE_MAC_BUF(mac2);
1120 1121
1121 printk(KERN_DEBUG "i596 0x%p, ", add); 1122 printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
1122 for (i = 0; i < 6; i++) 1123 add, print_mac(mac, add + 6), print_mac(mac2, add),
1123 printk(" %02X", add[i + 6]); 1124 add[12], add[13], str);
1124 printk(" -->");
1125 for (i = 0; i < 6; i++)
1126 printk(" %02X", add[i]);
1127 printk(" %02X%02X, %s\n", add[12], add[13], str);
1128} 1125}
1129 1126
1130static int io = 0x300; 1127static int io = 0x300;
@@ -1539,6 +1536,7 @@ static void set_multicast_list(struct net_device *dev)
1539 struct dev_mc_list *dmi; 1536 struct dev_mc_list *dmi;
1540 unsigned char *cp; 1537 unsigned char *cp;
1541 struct mc_cmd *cmd; 1538 struct mc_cmd *cmd;
1539 DECLARE_MAC_BUF(mac);
1542 1540
1543 if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out")) 1541 if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out"))
1544 return; 1542 return;
@@ -1549,8 +1547,8 @@ static void set_multicast_list(struct net_device *dev)
1549 for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) { 1547 for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) {
1550 memcpy(cp, dmi->dmi_addr, 6); 1548 memcpy(cp, dmi->dmi_addr, 6);
1551 if (i596_debug > 1) 1549 if (i596_debug > 1)
1552 DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %02x:%02x:%02x:%02x:%02x:%02x\n", 1550 DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %s\n",
1553 dev->name, cp[0],cp[1],cp[2],cp[3],cp[4],cp[5])); 1551 dev->name, print_mac(mac, cp)));
1554 } 1552 }
1555 i596_add_cmd(dev, &cmd->cmd); 1553 i596_add_cmd(dev, &cmd->cmd);
1556 } 1554 }