lkml.org 
[lkml]   [2013]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 080/100] rtlwifi: Align private space in rtl_priv struct
    Date
    3.5.7.23 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Larry Finger <Larry.Finger@lwfinger.net>

    commit 60ce314d1750fef843e9db70050e09e49f838b69 upstream.

    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>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/net/wireless/rtlwifi/wifi.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
    index cdaa21f..dec7c55 100644
    --- a/drivers/net/wireless/rtlwifi/wifi.h
    +++ b/drivers/net/wireless/rtlwifi/wifi.h
    @@ -1701,7 +1701,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))
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-10-11 13:21    [W:6.033 / U:0.848 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site