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 /include/linux | |
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 'include/linux')
-rw-r--r-- | include/linux/if_ether.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 42dc6a3571ec..e157c1399b61 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
@@ -129,7 +129,8 @@ extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); | |||
129 | /* | 129 | /* |
130 | * Display a 6 byte device address (MAC) in a readable format. | 130 | * Display a 6 byte device address (MAC) in a readable format. |
131 | */ | 131 | */ |
132 | extern __pure char *print_mac(char *buf, const unsigned char *addr); | 132 | extern char *print_mac(char *buf, const unsigned char *addr); |
133 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" | ||
133 | #define MAC_BUF_SIZE 18 | 134 | #define MAC_BUF_SIZE 18 |
134 | #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] __maybe_unused | 135 | #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] __maybe_unused |
135 | 136 | ||