diff options
author | Joe Perches <joe@perches.com> | 2008-02-18 02:34:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-18 02:34:54 -0500 |
commit | 235365f3aaaa10b7056293877c0ead50425f25c7 (patch) | |
tree | bbdb464d35a6985aa5bbec6654eb255f37974217 /net/8021q | |
parent | b791160b5af4ea95c72fb59d13079664beca1963 (diff) |
net/8021q/vlan_dev.c: Use print_mac.
Remove direct use of MAC_FMT
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/vlan_dev.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 77f04e49a1a0..fc60c6d096b9 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -366,7 +366,8 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
366 | { | 366 | { |
367 | struct net_device_stats *stats = &dev->stats; | 367 | struct net_device_stats *stats = &dev->stats; |
368 | struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); | 368 | struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data); |
369 | 369 | DECLARE_MAC_BUF(mac); | |
370 | DECLARE_MAC_BUF(mac2); | ||
370 | /* Handle non-VLAN frames if they are sent to us, for example by DHCP. | 371 | /* Handle non-VLAN frames if they are sent to us, for example by DHCP. |
371 | * | 372 | * |
372 | * NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING | 373 | * NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING |
@@ -404,11 +405,8 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
404 | 405 | ||
405 | pr_debug("%s: about to send skb: %p to dev: %s\n", | 406 | pr_debug("%s: about to send skb: %p to dev: %s\n", |
406 | __FUNCTION__, skb, skb->dev->name); | 407 | __FUNCTION__, skb, skb->dev->name); |
407 | pr_debug(" " MAC_FMT " " MAC_FMT " %4hx %4hx %4hx\n", | 408 | pr_debug(" %s %s %4hx %4hx %4hx\n", |
408 | veth->h_dest[0], veth->h_dest[1], veth->h_dest[2], | 409 | print_mac(mac, veth->h_dest), print_mac(mac2, veth->h_source), |
409 | veth->h_dest[3], veth->h_dest[4], veth->h_dest[5], | ||
410 | veth->h_source[0], veth->h_source[1], veth->h_source[2], | ||
411 | veth->h_source[3], veth->h_source[4], veth->h_source[5], | ||
412 | veth->h_vlan_proto, veth->h_vlan_TCI, | 410 | veth->h_vlan_proto, veth->h_vlan_TCI, |
413 | veth->h_vlan_encapsulated_proto); | 411 | veth->h_vlan_encapsulated_proto); |
414 | 412 | ||