lkml.org 
[lkml]   [2018]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 046/281] staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before calling hfa384x_drvr_setconfig16, also fixes relative sparse warning
    Date
    From: Andrea della Porta <sfaragnaus@gmail.com>

    [ Upstream commit dea20579a69ab68cdca6adf79bb7c0c162eb9b72 ]

    staging: wlan-ng: prism2mgmt.c: This patches fixes a double endian conversion.
    cpu_to_le16() was called twice first in prism2mgmt_scan and again inside
    hfa384x_drvr_setconfig16() for the same variable, hence it was swapped
    twice. Incidentally, it also fixed the following sparse warning:

    drivers/staging/wlan-ng/prism2mgmt.c:173:30: warning: incorrect type in assignment (different base types)
    drivers/staging/wlan-ng/prism2mgmt.c:173:30: expected unsigned short [unsigned] [usertype] word
    drivers/staging/wlan-ng/prism2mgmt.c:173:30: got restricted __le16 [usertype] <noident>

    Unfortunately, only compile tested.

    Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/staging/wlan-ng/prism2mgmt.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
    index 170de1c9eac4..f815f9d5045f 100644
    --- a/drivers/staging/wlan-ng/prism2mgmt.c
    +++ b/drivers/staging/wlan-ng/prism2mgmt.c
    @@ -169,7 +169,7 @@ int prism2mgmt_scan(struct wlandevice *wlandev, void *msgp)
    hw->ident_sta_fw.variant) >
    HFA384x_FIRMWARE_VERSION(1, 5, 0)) {
    if (msg->scantype.data != P80211ENUM_scantype_active)
    - word = cpu_to_le16(msg->maxchanneltime.data);
    + word = msg->maxchanneltime.data;
    else
    word = 0;

    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-19 22:31    [W:2.680 / U:0.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site