diff options
Diffstat (limited to 'drivers/net/lib82596.c')
-rw-r--r-- | drivers/net/lib82596.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index b59f442bbf36..cc8f64197a90 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -1034,12 +1034,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1034 | 1034 | ||
1035 | static void print_eth(unsigned char *add, char *str) | 1035 | static void print_eth(unsigned char *add, char *str) |
1036 | { | 1036 | { |
1037 | DECLARE_MAC_BUF(mac); | 1037 | printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n", |
1038 | DECLARE_MAC_BUF(mac2); | 1038 | add, add + 6, add, add[12], add[13], str); |
1039 | |||
1040 | printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n", | ||
1041 | add, print_mac(mac, add + 6), print_mac(mac2, add), | ||
1042 | add[12], add[13], str); | ||
1043 | } | 1039 | } |
1044 | 1040 | ||
1045 | static int __devinit i82596_probe(struct net_device *dev) | 1041 | static int __devinit i82596_probe(struct net_device *dev) |
@@ -1343,7 +1339,6 @@ static void set_multicast_list(struct net_device *dev) | |||
1343 | struct i596_private *lp = netdev_priv(dev); | 1339 | struct i596_private *lp = netdev_priv(dev); |
1344 | struct i596_dma *dma = lp->dma; | 1340 | struct i596_dma *dma = lp->dma; |
1345 | int config = 0, cnt; | 1341 | int config = 0, cnt; |
1346 | DECLARE_MAC_BUF(mac); | ||
1347 | 1342 | ||
1348 | DEB(DEB_MULTI, | 1343 | DEB(DEB_MULTI, |
1349 | printk(KERN_DEBUG | 1344 | printk(KERN_DEBUG |
@@ -1407,8 +1402,8 @@ static void set_multicast_list(struct net_device *dev) | |||
1407 | if (i596_debug > 1) | 1402 | if (i596_debug > 1) |
1408 | DEB(DEB_MULTI, | 1403 | DEB(DEB_MULTI, |
1409 | printk(KERN_DEBUG | 1404 | printk(KERN_DEBUG |
1410 | "%s: Adding address %s\n", | 1405 | "%s: Adding address %pM\n", |
1411 | dev->name, print_mac(mac, cp))); | 1406 | dev->name, cp)); |
1412 | } | 1407 | } |
1413 | DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd)); | 1408 | DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd)); |
1414 | i596_add_cmd(dev, &cmd->cmd); | 1409 | i596_add_cmd(dev, &cmd->cmd); |