diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2013-09-18 21:21:35 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-09-26 14:02:30 -0400 |
| commit | 60ce314d1750fef843e9db70050e09e49f838b69 (patch) | |
| tree | a3878e432888deda4fa844ffa2ef620eac10ff1c /drivers/net/wireless/rtlwifi/wifi.h | |
| parent | 919123d246adf3e69320900842015368c2384d0f (diff) | |
| download | talos-op-linux-60ce314d1750fef843e9db70050e09e49f838b69.tar.gz talos-op-linux-60ce314d1750fef843e9db70050e09e49f838b69.zip | |
rtlwifi: Align private space in rtl_priv struct
The private array at the end of the rtl_priv struct is not aligned.
On ARM architecture, this causes an alignment trap and is fixed by aligning
that array with __align(sizeof(void *)). That should properly align that
space according to the requirements of all architectures.
Reported-by: Jason Andrews <jasona@cadence.com>
Tested-by: Jason Andrews <jasona@cadence.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/wifi.h')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index cc03e7c87cbe..703258742d28 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -2057,7 +2057,7 @@ struct rtl_priv { that it points to the data allocated beyond this structure like: rtl_pci_priv or rtl_usb_priv */ - u8 priv[0]; + u8 priv[0] __aligned(sizeof(void *)); }; #define rtl_priv(hw) (((struct rtl_priv *)(hw)->priv)) |
