diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-02 12:34:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-02 12:34:23 -0700 |
| commit | ba5082c71476891623757956ebfc36040ac317e2 (patch) | |
| tree | 778099b4c28e9089af438ca53f79613c43617069 /include/uapi/linux/dn.h | |
| parent | bd3f5433255292d8d5080b532e729a577ec4912c (diff) | |
| parent | 1409a93274bb1b17f0b7a0b255a75e80899eec11 (diff) | |
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/dn.h')
| -rw-r--r-- | include/uapi/linux/dn.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/dn.h b/include/uapi/linux/dn.h index 9c50445462d9..5fbdd3d49eba 100644 --- a/include/uapi/linux/dn.h +++ b/include/uapi/linux/dn.h @@ -2,6 +2,7 @@ #define _LINUX_DN_H #include <linux/types.h> +#include <linux/if_ether.h> /* @@ -120,7 +121,7 @@ struct linkinfo_dn { * Ethernet address format (for DECnet) */ union etheraddress { - __u8 dne_addr[6]; /* Full ethernet address */ + __u8 dne_addr[ETH_ALEN]; /* Full ethernet address */ struct { __u8 dne_hiord[4]; /* DECnet HIORD prefix */ __u8 dne_nodeaddr[2]; /* DECnet node address */ |