summaryrefslogtreecommitdiff
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-29 15:28:14 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-05-29 15:28:14 +0400
commitf70977fbd6359efb17bb93adac37b9f226d910a7 (patch)
treed36c3ace7ae638ec447b7cce39617d950d121265 /net/mac80211/rx.c
parent2807bd18cc60ec471917b5158e98e4d7b7e030fb (diff)
parente6f8a4d60b905eae1a20cbb0c72c67b26b2f02fd (diff)
downloadlinux-f70977fbd6359efb17bb93adac37b9f226d910a7.tar.xz
Merge back earlier ACPI thermal material.
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 216c45b949e5..2b608b2b70ec 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1231,7 +1231,8 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx)
if (ether_addr_equal(bssid, rx->sdata->u.ibss.bssid) &&
test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {
sta->last_rx = jiffies;
- if (ieee80211_is_data(hdr->frame_control)) {
+ if (ieee80211_is_data(hdr->frame_control) &&
+ !is_multicast_ether_addr(hdr->addr1)) {
sta->last_rx_rate_idx = status->rate_idx;
sta->last_rx_rate_flag = status->flag;
sta->last_rx_rate_vht_flag = status->vht_flag;