diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-13 11:35:09 -0500 |
| commit | bc7ecbcbc2c0ff235382077b55de7896775afc16 (patch) | |
| tree | 9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /include/linux/if_ether.h | |
| parent | c52854018ad123c9ef83867462457b75bb56d452 (diff) | |
| parent | 285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'include/linux/if_ether.h')
| -rw-r--r-- | include/linux/if_ether.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 580b6004d00e..299b4121f914 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
| @@ -136,13 +136,7 @@ extern struct ctl_table ether_table[]; | |||
| 136 | 136 | ||
| 137 | extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); | 137 | extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len); |
| 138 | 138 | ||
| 139 | /* | ||
| 140 | * Display a 6 byte device address (MAC) in a readable format. | ||
| 141 | */ | ||
| 142 | extern char *print_mac(char *buf, const unsigned char *addr) __deprecated; | ||
| 143 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" | 139 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" |
| 144 | #define MAC_BUF_SIZE 18 | ||
| 145 | #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] | ||
| 146 | 140 | ||
| 147 | #endif | 141 | #endif |
| 148 | 142 | ||