diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-02 23:34:23 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-02 23:34:23 +0400 |
| commit | ba5082c71476891623757956ebfc36040ac317e2 (patch) | |
| tree | 778099b4c28e9089af438ca53f79613c43617069 /include/uapi/linux/if_bridge.h | |
| parent | bd3f5433255292d8d5080b532e729a577ec4912c (diff) | |
| parent | 1409a93274bb1b17f0b7a0b255a75e80899eec11 (diff) | |
| download | linux-ba5082c71476891623757956ebfc36040ac317e2.tar.xz | |
Merge branch 'eth_alen'
Joe Perches says:
====================
Convert the uses mac addresses to ETH_ALEN so
it's easier to find and verify where mac addresses
need to be __aligned(2)
Change in V2:
- Remove include/acpi/actbl2.h conversion
It's a file copied from outside ACPI sources
Changes in V3:
- Don't move the pasemi_mac.h mac address to be aligned(2)
Just note that it's unaligned.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/if_bridge.h')
| -rw-r--r-- | include/uapi/linux/if_bridge.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h index 2d70d79ce2fd..39f621a9fe82 100644 --- a/include/uapi/linux/if_bridge.h +++ b/include/uapi/linux/if_bridge.h @@ -14,6 +14,7 @@ #define _UAPI_LINUX_IF_BRIDGE_H #include <linux/types.h> +#include <linux/if_ether.h> #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" @@ -88,7 +89,7 @@ struct __port_info { }; struct __fdb_entry { - __u8 mac_addr[6]; + __u8 mac_addr[ETH_ALEN]; __u8 port_no; __u8 is_local; __u32 ageing_timer_value; |