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/net | |
| 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/net')
| -rw-r--r-- | include/net/irda/irlan_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/irda/irlan_common.h b/include/net/irda/irlan_common.h index 0af8b8dfbc22..550c2d6ec7ff 100644 --- a/include/net/irda/irlan_common.h +++ b/include/net/irda/irlan_common.h @@ -32,6 +32,7 @@ #include <linux/types.h> #include <linux/skbuff.h> #include <linux/netdevice.h> +#include <linux/if_ether.h> #include <net/irda/irttp.h> @@ -161,7 +162,7 @@ struct irlan_provider_cb { int access_type; /* Access type */ __u16 send_arb_val; - __u8 mac_address[6]; /* Generated MAC address for peer device */ + __u8 mac_address[ETH_ALEN]; /* Generated MAC address for peer device */ }; /* |