Commit c019b6ef authored Apr 29, 2017 by Andrea della Porta Committed by Greg Kroah-Hartman Apr 13, 2018

staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before...


staging: wlan-ng: prism2mgmt.c: fixed a double endian conversion before calling hfa384x_drvr_setconfig16, also fixes relative sparse warning


[ 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>

parent 8587ce21

drivers/staging/wlan-ng/prism2mgmt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;