lkml.org 
[lkml]   [2019]   [Mar]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 60/78] mac80211: Add attribute aligned(2) to struct action
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit 7c53eb5d87bc21464da4268c3c0c47457b6d9c9b ]

    During refactor in commit 9e478066eae4 ("mac80211: fix MU-MIMO
    follow-MAC mode") a new struct 'action' was declared with packed
    attribute as:

    struct {
    struct ieee80211_hdr_3addr hdr;
    u8 category;
    u8 action_code;
    } __packed action;

    But since struct 'ieee80211_hdr_3addr' is declared with an aligned
    keyword as:

    struct ieee80211_hdr {
    __le16 frame_control;
    __le16 duration_id;
    u8 addr1[ETH_ALEN];
    u8 addr2[ETH_ALEN];
    u8 addr3[ETH_ALEN];
    __le16 seq_ctrl;
    u8 addr4[ETH_ALEN];
    } __packed __aligned(2);

    Solve the ambiguity of placing aligned structure in a packed one by
    adding the aligned(2) attribute to struct 'action'.

    This removes the following warning (W=1):

    net/mac80211/rx.c:234:2: warning: alignment 1 of 'struct <anonymous>' is less than 2 [-Wpacked-not-aligned]

    Cc: Johannes Berg <johannes.berg@intel.com>
    Suggested-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Mathieu Malaterre <malat@debian.org>
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/mac80211/rx.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
    index d7a05a9944421..e946ee4f335bd 100644
    --- a/net/mac80211/rx.c
    +++ b/net/mac80211/rx.c
    @@ -221,7 +221,7 @@ static void ieee80211_handle_mu_mimo_mon(struct ieee80211_sub_if_data *sdata,
    struct ieee80211_hdr_3addr hdr;
    u8 category;
    u8 action_code;
    - } __packed action;
    + } __packed __aligned(2) action;

    if (!sdata)
    return;
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-03-04 09:41    [W:4.064 / U:0.664 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site