| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Andrea della Porta <sfaragnaus@gmail.com> |
| Date: Sat, 29 Apr 2017 07:30:23 +0100 |
| Subject: staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before calling hfa384x_drvr_setconfig16, also fixes relative sparse warning |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/staging/wlan-ng/prism2mgmt.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/staging/wlan-ng/prism2mgmt.c |
| +++ b/drivers/staging/wlan-ng/prism2mgmt.c |
| @@ -169,7 +169,7 @@ int prism2mgmt_scan(struct wlandevice *w |
| 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; |
| |
