diff options
Diffstat (limited to 'include/net/bonding.h')
| -rw-r--r-- | include/net/bonding.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/net/bonding.h b/include/net/bonding.h index 791800ddd6d9..6360c259da6d 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h | |||
| @@ -34,6 +34,9 @@ | |||
| 34 | 34 | ||
| 35 | #define BOND_DEFAULT_MIIMON 100 | 35 | #define BOND_DEFAULT_MIIMON 100 |
| 36 | 36 | ||
| 37 | #ifndef __long_aligned | ||
| 38 | #define __long_aligned __attribute__((aligned((sizeof(long))))) | ||
| 39 | #endif | ||
| 37 | /* | 40 | /* |
| 38 | * Less bad way to call ioctl from within the kernel; this needs to be | 41 | * Less bad way to call ioctl from within the kernel; this needs to be |
| 39 | * done some other way to get the call out of interrupt context. | 42 | * done some other way to get the call out of interrupt context. |
| @@ -138,7 +141,9 @@ struct bond_params { | |||
| 138 | struct reciprocal_value reciprocal_packets_per_slave; | 141 | struct reciprocal_value reciprocal_packets_per_slave; |
| 139 | u16 ad_actor_sys_prio; | 142 | u16 ad_actor_sys_prio; |
| 140 | u16 ad_user_port_key; | 143 | u16 ad_user_port_key; |
| 141 | u8 ad_actor_system[ETH_ALEN]; | 144 | |
| 145 | /* 2 bytes of padding : see ether_addr_equal_64bits() */ | ||
| 146 | u8 ad_actor_system[ETH_ALEN + 2]; | ||
| 142 | }; | 147 | }; |
| 143 | 148 | ||
| 144 | struct bond_parm_tbl { | 149 | struct bond_parm_tbl { |
