2014-05-01 08:03:49

by Henning Rogge

Subject: [PATCH] mac80211: Fix mac80211 station info rx bitrate for IBSS mode

From: Henning Rogge <[email protected]>

Filter out incoming multicast packages before applying their bitrate
to the rx bitrate station info field to prevent them from setting the
rx bitrate to the basic multicast rate.

Signed-off-by: Henning Rogge <[email protected]>
---
net/mac80211/rx.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 216c45b..2b608b2 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;
--
1.9.0

2014-05-05 12:59:45

by Johannes Berg

Subject: Re: [PATCH] mac80211: Fix mac80211 station info rx bitrate for IBSS mode

On Thu, 2014-05-01 at 10:03 +0200, Henning Rogge wrote:
> From: Henning Rogge <[email protected]>
>
> Filter out incoming multicast packages before applying their bitrate
> to the rx bitrate station info field to prevent them from setting the
> rx bitrate to the basic multicast rate.

Applied, thanks.

johannes