Commit da279569 authored by Johannes Berg's avatar Johannes Berg Committed by Zheng Zengkai
Browse files

wifi: mac80211_hwsim: add back erroneously removed cast 

stable inclusion
from stable-v5.10.137
commit d400222f49599423862010f0c7f6fee142be72d7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I60PLB

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d400222f49599423862010f0c7f6fee142be72d7



--------------------------------

commit 58b6259d upstream.

The robots report that we're now casting to a differently
sized integer, which is correct, and the previous patch
had erroneously removed it.

Reported-by: default avatarkernel test robot <lkp@intel.com>
Fixes: 4ee186fa ("wifi: mac80211_hwsim: fix race condition in pending packet")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Cc: Jeongik Cha <jeongik@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
parent 6e7a4c19

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -3540,7 +3540,7 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, 
		u64 skb_cookie;



		txi = IEEE80211_SKB_CB(skb);

		skb_cookie = (u64)txi->rate_driver_data[0];

		skb_cookie = (u64)(uintptr_t)txi->rate_driver_data[0];



		if (skb_cookie == ret_skb_cookie) {

			__skb_unlink(skb, &data2->pending);