You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
UPSTREAM: wifi: mac80211_hwsim: add back erroneously removed cast
commit58b6259d82upstream. 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: kernel test robot <lkp@intel.com> Fixes:4ee186fa7e("wifi: mac80211_hwsim: fix race condition in pending packet") Signed-off-by: Johannes Berg <johannes.berg@intel.com> Cc: Jeongik Cha <jeongik@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commitd400222f49) Signed-off-by: Carlos Llamas <cmllamas@google.com> Bug: 236994625 Change-Id: I4b5cfa77c47d4d03b46600f0b543e27340c228c0
This commit is contained in:
@@ -3546,7 +3546,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);
|
||||
|
||||
Reference in New Issue
Block a user