diff options
| author |   Oleksij Rempel <linux@rempel-privat.de> | 2014-01-15 17:11:39 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2014-01-16 14:55:45 -0500 |
| commit | e4e19c031901e95dc7d1cf0a2c9c50525d71651f (patch) | |
| tree | 1d6b8dc065e9a0d666b69d2ec55f396a3c20b4d8 /drivers | |
| parent | ath5k: use ath_is_mybeacon (diff) | |
| download | linux-dev-e4e19c031901e95dc7d1cf0a2c9c50525d71651f.tar.xz linux-dev-e4e19c031901e95dc7d1cf0a2c9c50525d71651f.zip | |
carl9170: use ath_is_mybeacon
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/ath/carl9170/rx.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c index 1b1b20751ead..536bc46a2912 100644 --- a/drivers/net/wireless/ath/carl9170/rx.c +++ b/drivers/net/wireless/ath/carl9170/rx.c @@ -519,6 +519,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) { struct ieee80211_hdr *hdr = data; struct ieee80211_tim_ie *tim_ie; + struct ath_common *common = &ar->common; u8 *tim; u8 tim_len; bool cam; @@ -526,17 +527,13 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) if (likely(!(ar->hw->conf.flags & IEEE80211_CONF_PS))) return; - /* check if this really is a beacon */ - if (!ieee80211_is_beacon(hdr->frame_control)) - return; - /* min. beacon length + FCS_LEN */ if (len <= 40 + FCS_LEN) return; + /* check if this really is a beacon */ /* and only beacons from the associated BSSID, please */ - if (!ether_addr_equal_64bits(hdr->addr3, ar->common.curbssid) || - !ar->common.curaid) + if (!ath_is_mybeacon(common, hdr) || !common->curaid) return; ar->ps.last_beacon = jiffies; |