lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 460/917] mt76: mt7615: fix endianness warning in mt7615_mac_write_txwi
    Date
    From: Lorenzo Bianconi <lorenzo@kernel.org>

    [ Upstream commit d81bfb41e30c42531536c5d2baa4d275a8309715 ]

    Fix the following sparse warning in mt7615_mac_write_txwi routine:
    drivers/net/wireless/mediatek/mt76/mt7615/mac.c:758:17:
    warning: incorrect type in assignment
    expected restricted __le32 [usertype]
    got unsigned long

    Fixes: 04b8e65922f63 ("mt76: add mac80211 driver for MT7615 PCIe-based chipsets")
    Fixes: d4bf77bd74930 ("mt76: mt7615: introduce mt7663u support to mt7615_write_txwi")
    Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 15 +++++++++------
    1 file changed, 9 insertions(+), 6 deletions(-)

    diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
    index a83e48c07a71e..5455231f51881 100644
    --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
    +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
    @@ -755,12 +755,15 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,
    if (info->flags & IEEE80211_TX_CTL_NO_ACK)
    txwi[3] |= cpu_to_le32(MT_TXD3_NO_ACK);

    - txwi[7] = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
    - FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype) |
    - FIELD_PREP(MT_TXD7_SPE_IDX, 0x18);
    - if (!is_mmio)
    - txwi[8] = FIELD_PREP(MT_TXD8_L_TYPE, fc_type) |
    - FIELD_PREP(MT_TXD8_L_SUB_TYPE, fc_stype);
    + val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
    + FIELD_PREP(MT_TXD7_SUB_TYPE, fc_stype) |
    + FIELD_PREP(MT_TXD7_SPE_IDX, 0x18);
    + txwi[7] = cpu_to_le32(val);
    + if (!is_mmio) {
    + val = FIELD_PREP(MT_TXD8_L_TYPE, fc_type) |
    + FIELD_PREP(MT_TXD8_L_SUB_TYPE, fc_stype);
    + txwi[8] = cpu_to_le32(val);
    + }

    return 0;
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 01:33    [W:3.091 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site