diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:09:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:09:11 -0500 |
commit | 55b01e8681cba392ccda4ff6184054d38968115d (patch) | |
tree | c3c95e84581a5a4a04bbad82d885c3bd99bfba67 /net/8021q/vlan_dev.c | |
parent | bc4bf5f38cf0a623e6a29f52ec80bfcc56a373c6 (diff) |
[NET]: Restore sanity wrt. print_mac().
MAC_FMT had only one user and we tried to get rid of
that, but this created more problems than it solved.
As a result, this reverts three commits:
235365f3aaaa10b7056293877c0ead50425f25c7 ("net/8021q/vlan_dev.c: Use
print_mac."), fea5fa875eb235dc186b1f5184eb36abc63e26cc ("[NET]: Remove
MAC_FMT"), and 8f789c48448aed74fe1c07af76de8f04adacec7d ("[NET]:
Elminate spurious print_mac() calls.")
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan_dev.c')
-rw-r--r-- | net/8021q/vlan_dev.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index fc60c6d096b9..77f04e49a1a0 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -366,8 +366,7 @@ 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 | DECLARE_MAC_BUF(mac); | 369 | |
370 | DECLARE_MAC_BUF(mac2); | ||
371 | /* Handle non-VLAN frames if they are sent to us, for example by DHCP. | 370 | /* Handle non-VLAN frames if they are sent to us, for example by DHCP. |
372 | * | 371 | * |
373 | * NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING | 372 | * NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING |
@@ -405,8 +404,11 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
405 | 404 | ||
406 | pr_debug("%s: about to send skb: %p to dev: %s\n", | 405 | pr_debug("%s: about to send skb: %p to dev: %s\n", |
407 | __FUNCTION__, skb, skb->dev->name); | 406 | __FUNCTION__, skb, skb->dev->name); |
408 | pr_debug(" %s %s %4hx %4hx %4hx\n", | 407 | pr_debug(" " MAC_FMT " " MAC_FMT " %4hx %4hx %4hx\n", |
409 | print_mac(mac, veth->h_dest), print_mac(mac2, veth->h_source), | 408 | veth->h_dest[0], veth->h_dest[1], veth->h_dest[2], |
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], | ||
410 | veth->h_vlan_proto, veth->h_vlan_TCI, | 412 | veth->h_vlan_proto, veth->h_vlan_TCI, |
411 | veth->h_vlan_encapsulated_proto); | 413 | veth->h_vlan_encapsulated_proto); |
412 | 414 | ||