diff options
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/br2684.c | 5 | ||||
-rw-r--r-- | net/atm/lec.c | 26 |
2 files changed, 7 insertions, 24 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 280de481edc7..29ef8dc6921b 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
@@ -698,12 +698,11 @@ static int br2684_seq_show(struct seq_file *seq, void *v) | |||
698 | br2684_devs); | 698 | br2684_devs); |
699 | const struct net_device *net_dev = brdev->net_dev; | 699 | const struct net_device *net_dev = brdev->net_dev; |
700 | const struct br2684_vcc *brvcc; | 700 | const struct br2684_vcc *brvcc; |
701 | DECLARE_MAC_BUF(mac); | ||
702 | 701 | ||
703 | seq_printf(seq, "dev %.16s: num=%d, mac=%s (%s)\n", | 702 | seq_printf(seq, "dev %.16s: num=%d, mac=%pM (%s)\n", |
704 | net_dev->name, | 703 | net_dev->name, |
705 | brdev->number, | 704 | brdev->number, |
706 | print_mac(mac, net_dev->dev_addr), | 705 | net_dev->dev_addr, |
707 | brdev->mac_was_set ? "set" : "auto"); | 706 | brdev->mac_was_set ? "set" : "auto"); |
708 | 707 | ||
709 | list_for_each_entry(brvcc, &brdev->brvccs, brvccs) { | 708 | list_for_each_entry(brvcc, &brdev->brvccs, brvccs) { |
diff --git a/net/atm/lec.c b/net/atm/lec.c index 8f701cde5945..1def62d17739 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -373,19 +373,13 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
373 | if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) { | 373 | if (entry && (entry->tx_wait.qlen < LEC_UNRES_QUE_LEN)) { |
374 | pr_debug("%s:lec_start_xmit: queuing packet, ", | 374 | pr_debug("%s:lec_start_xmit: queuing packet, ", |
375 | dev->name); | 375 | dev->name); |
376 | pr_debug("MAC address " MAC_FMT "\n", | 376 | pr_debug("MAC address %pM\n", lec_h->h_dest); |
377 | lec_h->h_dest[0], lec_h->h_dest[1], | ||
378 | lec_h->h_dest[2], lec_h->h_dest[3], | ||
379 | lec_h->h_dest[4], lec_h->h_dest[5]); | ||
380 | skb_queue_tail(&entry->tx_wait, skb); | 377 | skb_queue_tail(&entry->tx_wait, skb); |
381 | } else { | 378 | } else { |
382 | pr_debug | 379 | pr_debug |
383 | ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ", | 380 | ("%s:lec_start_xmit: tx queue full or no arp entry, dropping, ", |
384 | dev->name); | 381 | dev->name); |
385 | pr_debug("MAC address " MAC_FMT "\n", | 382 | pr_debug("MAC address %pM\n", lec_h->h_dest); |
386 | lec_h->h_dest[0], lec_h->h_dest[1], | ||
387 | lec_h->h_dest[2], lec_h->h_dest[3], | ||
388 | lec_h->h_dest[4], lec_h->h_dest[5]); | ||
389 | priv->stats.tx_dropped++; | 383 | priv->stats.tx_dropped++; |
390 | dev_kfree_skb(skb); | 384 | dev_kfree_skb(skb); |
391 | } | 385 | } |
@@ -397,10 +391,7 @@ static int lec_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
397 | 391 | ||
398 | while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) { | 392 | while (entry && (skb2 = skb_dequeue(&entry->tx_wait))) { |
399 | pr_debug("lec.c: emptying tx queue, "); | 393 | pr_debug("lec.c: emptying tx queue, "); |
400 | pr_debug("MAC address " MAC_FMT "\n", | 394 | pr_debug("MAC address %pM\n", lec_h->h_dest); |
401 | lec_h->h_dest[0], lec_h->h_dest[1], | ||
402 | lec_h->h_dest[2], lec_h->h_dest[3], | ||
403 | lec_h->h_dest[4], lec_h->h_dest[5]); | ||
404 | lec_send(vcc, skb2, priv); | 395 | lec_send(vcc, skb2, priv); |
405 | } | 396 | } |
406 | 397 | ||
@@ -539,15 +530,8 @@ static int lec_atm_send(struct atm_vcc *vcc, struct sk_buff *skb) | |||
539 | { | 530 | { |
540 | struct net_bridge_fdb_entry *f; | 531 | struct net_bridge_fdb_entry *f; |
541 | 532 | ||
542 | pr_debug | 533 | pr_debug("%s: bridge zeppelin asks about %pM\n", |
543 | ("%s: bridge zeppelin asks about " MAC_FMT "\n", | 534 | dev->name, mesg->content.proxy.mac_addr); |
544 | dev->name, | ||
545 | mesg->content.proxy.mac_addr[0], | ||
546 | mesg->content.proxy.mac_addr[1], | ||
547 | mesg->content.proxy.mac_addr[2], | ||
548 | mesg->content.proxy.mac_addr[3], | ||
549 | mesg->content.proxy.mac_addr[4], | ||
550 | mesg->content.proxy.mac_addr[5]); | ||
551 | 535 | ||
552 | if (br_fdb_get_hook == NULL || dev->br_port == NULL) | 536 | if (br_fdb_get_hook == NULL || dev->br_port == NULL) |
553 | break; | 537 | break; |