diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/recv.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 5bf3243dce0f..a0ebdd000fc2 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -969,21 +969,6 @@ static void ath9k_process_tsf(struct ath_rx_status *rs, | |||
969 | rxs->mactime += 0x100000000ULL; | 969 | rxs->mactime += 0x100000000ULL; |
970 | } | 970 | } |
971 | 971 | ||
972 | static bool ath9k_is_mybeacon(struct ath_softc *sc, struct ieee80211_hdr *hdr) | ||
973 | { | ||
974 | struct ath_hw *ah = sc->sc_ah; | ||
975 | struct ath_common *common = ath9k_hw_common(ah); | ||
976 | |||
977 | if (ieee80211_is_beacon(hdr->frame_control)) { | ||
978 | RX_STAT_INC(rx_beacons); | ||
979 | if (!is_zero_ether_addr(common->curbssid) && | ||
980 | ether_addr_equal_64bits(hdr->addr3, common->curbssid)) | ||
981 | return true; | ||
982 | } | ||
983 | |||
984 | return false; | ||
985 | } | ||
986 | |||
987 | /* | 972 | /* |
988 | * For Decrypt or Demic errors, we only mark packet status here and always push | 973 | * For Decrypt or Demic errors, we only mark packet status here and always push |
989 | * up the frame up to let mac80211 handle the actual error case, be it no | 974 | * up the frame up to let mac80211 handle the actual error case, be it no |
@@ -1071,7 +1056,10 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc, | |||
1071 | goto exit; | 1056 | goto exit; |
1072 | } | 1057 | } |
1073 | 1058 | ||
1074 | rx_stats->is_mybeacon = ath9k_is_mybeacon(sc, hdr); | 1059 | if (ath_is_mybeacon(common, hdr)) { |
1060 | RX_STAT_INC(rx_beacons); | ||
1061 | rx_stats->is_mybeacon = true; | ||
1062 | } | ||
1075 | 1063 | ||
1076 | /* | 1064 | /* |
1077 | * This shouldn't happen, but have a safety check anyway. | 1065 | * This shouldn't happen, but have a safety check anyway. |