diff options
| author | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-17 17:56:22 -0500 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /include/linux/if_ether.h | |
| parent | 19439d05b88dafc4e55d9ffce84ccc27cf8b2bcc (diff) | |
| parent | 6ccf80eb15ccaca4d3f1ab5162b9ded5eecd9971 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/if_ether.h')
| -rw-r--r-- | include/linux/if_ether.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h index 005e1525ab86..299b4121f914 100644 --- a/include/linux/if_ether.h +++ b/include/linux/if_ether.h | |||
| @@ -137,8 +137,6 @@ extern struct ctl_table ether_table[]; | |||
| 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 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" | 139 | #define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" |
| 140 | #define MAC_BUF_SIZE 18 | ||
| 141 | #define DECLARE_MAC_BUF(var) char var[MAC_BUF_SIZE] | ||
| 142 | 140 | ||
| 143 | #endif | 141 | #endif |
| 144 | 142 | ||