Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86d7726d authored by Jakub Jedelsky's avatar Jakub Jedelsky Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192u: fix incorrect assignments 



Fixing warnings found by sparse on rtl8192u/ieee80211.

drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1318:45: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1318:45:    expected unsigned short [unsigned] [usertype] len
drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1318:45:    got restricted __be16 [usertype] <noident>

drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1481:40: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1481:40:    expected restricted __le16 <noident>
drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1481:40:    got int

drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1483:40: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1483:40:    expected restricted __le16 <noident>
drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1483:40:    got int

drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1487:45: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1487:45:    expected restricted __le16 <noident>
drivers/staging/rtl8192u/ieee80211//ieee80211_rx.c:1487:45:    gotunsigned short [unsigned] [usertype] <noident>

Signed-off-by: default avatarJakub Jedelsky <jakub.jedelsky@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 785185f4

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c

+6 −4
Original line number Diff line number Diff line
@@ -1315,7 +1315,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, 
				} else {

					u16 len;

					/* Leave Ethernet header part of hdr and full payload */

					len = htons(sub_skb->len);

					len = be16_to_cpu(htons(sub_skb->len));

					memcpy(skb_push(sub_skb, 2), &len, 2);

					memcpy(skb_push(sub_skb, ETH_ALEN), src, ETH_ALEN);

					memcpy(skb_push(sub_skb, ETH_ALEN), dst, ETH_ALEN);
@@ -1478,13 +1478,15 @@ static int ieee80211_qos_convert_ac_to_parameters(struct 
		/* WMM spec P.11: The minimum value for AIFSN shall be 2 */

		qos_param->aifs[aci] = (qos_param->aifs[aci] < 2) ? 2:qos_param->aifs[aci];



		qos_param->cw_min[aci] = ac_params->ecw_min_max & 0x0F;

		qos_param->cw_min[aci] =

		    cpu_to_le16(ac_params->ecw_min_max & 0x0F);



		qos_param->cw_max[aci] = (ac_params->ecw_min_max & 0xF0) >> 4;

		qos_param->cw_max[aci] =

		    cpu_to_le16((ac_params->ecw_min_max & 0xF0) >> 4);



		qos_param->flag[aci] =

		    (ac_params->aci_aifsn & 0x10) ? 0x01 : 0x00;

		qos_param->tx_op_limit[aci] = le16_to_cpu(ac_params->tx_op_limit);

		qos_param->tx_op_limit[aci] = ac_params->tx_op_limit;

	}

	return 0;

}