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

Commit 85f80951 authored by Johannes Berg's avatar Johannes Berg Committed by Weilun Du
Browse files

UPSTREAM: wifi: mac80211_hwsim: add back erroneously removed cast 



commit 58b6259d820d63c2adf1c7541b54cce5a2ae6073 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: 4ee186fa7e40 ("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>
(cherry picked from commit d400222f49599423862010f0c7f6fee142be72d7)
Signed-off-by: default avatarCarlos Llamas <cmllamas@google.com>
Bug: 236994625
Change-Id: I4b5cfa77c47d4d03b46600f0b543e27340c228c0
parent 8b32ee8a

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -3353,7 +3353,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);