Commit 55b01e86 authored by David S. Miller's avatar David S. Miller
Browse files

[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:

235365f3 ("net/8021q/vlan_dev.c: Use
print_mac."), fea5fa87 ("[NET]: Remove
MAC_FMT"), and 8f789c48 ("[NET]:
Elminate spurious print_mac() calls.")

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bc4bf5f3

include/linux/if_ether.h

+2 −1
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); 
/*

 *	Display a 6 byte device address (MAC) in a readable format.

 */

extern __pure char *print_mac(char *buf, const unsigned char *addr);

extern char *print_mac(char *buf, const unsigned char *addr);

#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x"

#define MAC_BUF_SIZE	18

#define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] __maybe_unused

net/8021q/vlan_dev.c

+6 −4
Original line number Diff line number Diff line
@@ -366,8 +366,7 @@ static int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
{

	struct net_device_stats *stats = &dev->stats;

	struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);

	DECLARE_MAC_BUF(mac);

	DECLARE_MAC_BUF(mac2);



	/* Handle non-VLAN frames if they are sent to us, for example by DHCP.

	 *

	 * 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) 


	pr_debug("%s: about to send skb: %p to dev: %s\n",

		__FUNCTION__, skb, skb->dev->name);

	pr_debug("  %s %s %4hx %4hx %4hx\n",

		 print_mac(mac, veth->h_dest), print_mac(mac2, veth->h_source),

	pr_debug("  " MAC_FMT " " MAC_FMT " %4hx %4hx %4hx\n",

		 veth->h_dest[0], veth->h_dest[1], veth->h_dest[2],

		 veth->h_dest[3], veth->h_dest[4], veth->h_dest[5],

		 veth->h_source[0], veth->h_source[1], veth->h_source[2],

		 veth->h_source[3], veth->h_source[4], veth->h_source[5],

		 veth->h_vlan_proto, veth->h_vlan_TCI,

		 veth->h_vlan_encapsulated_proto);

CRA Git | Maintained and supported by SUSTech CRA and CCSE