diff options
Diffstat (limited to 'include/linux/if_ether.h')
-rw-r--r-- | include/linux/if_ether.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 5f9297793661..e157c1399b61 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
@@ -90,6 +90,7 @@ | |||
90 | #define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ | 90 | #define ETH_P_WAN_PPP 0x0007 /* Dummy type for WAN PPP frames*/ |
91 | #define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ | 91 | #define ETH_P_PPP_MP 0x0008 /* Dummy type for PPP MP frames */ |
92 | #define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ | 92 | #define ETH_P_LOCALTALK 0x0009 /* Localtalk pseudo type */ |
93 | #define ETH_P_CAN 0x000C /* Controller Area Network */ | ||
93 | #define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ | 94 | #define ETH_P_PPPTALK 0x0010 /* Dummy type for Atalk over PPP*/ |
94 | #define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ | 95 | #define ETH_P_TR_802_2 0x0011 /* 802.2 frames */ |
95 | #define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */ | 96 | #define ETH_P_MOBITEX 0x0015 /* Mobitex (kaz@cafe.net) */ |
@@ -123,12 +124,15 @@ int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr); | |||
123 | extern struct ctl_table ether_table[]; | 124 | extern struct ctl_table ether_table[]; |
124 | #endif | 125 | #endif |
125 | 126 | ||
127 | extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); | ||
128 | |||
126 | /* | 129 | /* |
127 | * Display a 6 byte device address (MAC) in a readable format. | 130 | * Display a 6 byte device address (MAC) in a readable format. |
128 | */ | 131 | */ |
132 | extern char *print_mac(char *buf, const unsigned char *addr); | ||
129 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" | 133 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" |
130 | extern char *print_mac(char *buf, const u8 *addr); | 134 | #define MAC_BUF_SIZE 18 |
131 | #define DECLARE_MAC_BUF(var) char var[18] __maybe_unused | 135 | #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] __maybe_unused |
132 | 136 | ||
133 | #endif | 137 | #endif |
134 | 138 | ||