git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From foo@baz Tue Apr 10 13:58:07 CEST 2018
   2 From: Andrea della Porta <sfaragnaus@gmail.com>
   3 Date: Sat, 29 Apr 2017 07:30:23 +0100
   4 Subject: staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before calling hfa384x_drvr_setconfig16, also fixes relative sparse warning
   5
   6 From: Andrea della Porta <sfaragnaus@gmail.com>
   7
   8
   9 [ Upstream commit dea20579a69ab68cdca6adf79bb7c0c162eb9b72 ]
  10
  11 staging: wlan-ng: prism2mgmt.c: This patches fixes a double endian conversion.
  12 cpu_to_le16() was called twice first in prism2mgmt_scan and again inside
  13 hfa384x_drvr_setconfig16() for the same variable, hence it was swapped
  14 twice. Incidentally, it also fixed the following sparse warning:
  15
  16 drivers/staging/wlan-ng/prism2mgmt.c:173:30: warning: incorrect type in assignment (different base types)
  17 drivers/staging/wlan-ng/prism2mgmt.c:173:30:    expected unsigned short [unsigned] [usertype] word
  18 drivers/staging/wlan-ng/prism2mgmt.c:173:30:    got restricted __le16 [usertype] <noident>
  19
  20 Unfortunately, only compile tested.
  21
  22 Signed-off-by: Andrea della Porta <sfaragnaus@gmail.com>
  23 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  24 Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
  25 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  26 ---
  27  drivers/staging/wlan-ng/prism2mgmt.c |    2 +-
  28  1 file changed, 1 insertion(+), 1 deletion(-)
  29
  30 --- a/drivers/staging/wlan-ng/prism2mgmt.c
  31 +++ b/drivers/staging/wlan-ng/prism2mgmt.c
  32 @@ -169,7 +169,7 @@ int prism2mgmt_scan(wlandevice_t *wlande
  33                                      hw->ident_sta_fw.variant) >
  34             HFA384x_FIRMWARE_VERSION(1, 5, 0)) {
  35                 if (msg->scantype.data != P80211ENUM_scantype_active)
  36 -                       word = cpu_to_le16(msg->maxchanneltime.data);
  37 +                       word = msg->maxchanneltime.data;
  38                 else
  39                         word = 0;
  40