--- /dev/null
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -2359,7 +2359,7 @@ static void __ieee80211_rx_handle_packet
+ continue;
+ }
+
+- rx.sta = sta_info_get(prev, hdr->addr2);
++ rx.sta = sta_info_get_bss(prev, hdr->addr2);
+
+ rx.flags |= IEEE80211_RX_RA_MATCH;
+ prepares = prepare_for_handlers(prev, &rx, hdr);
+@@ -2395,7 +2395,7 @@ next:
+ }
+
+ if (prev) {
+- rx.sta = sta_info_get(prev, hdr->addr2);
++ rx.sta = sta_info_get_bss(prev, hdr->addr2);
+
+ rx.flags |= IEEE80211_RX_RA_MATCH;
+ prepares = prepare_for_handlers(prev, &rx, hdr);