From patchwork Mon Dec 5 22:12:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 9461657 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 727A560236 for ; Mon, 5 Dec 2016 22:12:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 632A22816B for ; Mon, 5 Dec 2016 22:12:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5606C281F9; Mon, 5 Dec 2016 22:12:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD95C2816B for ; Mon, 5 Dec 2016 22:12:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751639AbcLEWMT (ORCPT ); Mon, 5 Dec 2016 17:12:19 -0500 Received: from mail2.candelatech.com ([208.74.158.173]:60154 "EHLO mail2.candelatech.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbcLEWMS (ORCPT ); Mon, 5 Dec 2016 17:12:18 -0500 Received: from ben-dt3.candelatech.com (firewall.candelatech.com [50.251.239.81]) by mail2.candelatech.com (Postfix) with ESMTP id C09BE40A626; Mon, 5 Dec 2016 14:12:17 -0800 (PST) From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Ben Greear Subject: [PATCH] mac80211: fix rx-rate report when rate is invalid. Date: Mon, 5 Dec 2016 14:12:15 -0800 Message-Id: <1480975935-12760-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 2.4.11 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ben Greear This fixes obtaining the rate info via sta_set_sinfo when the rx rate is invalid (for instance, on IBSS interface that has received no frames from one of its peers). Signed-off-by: Ben Greear --- net/mac80211/sta_info.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 01868f9..868dc88 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2076,10 +2076,12 @@ static void sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) { u16 rate = ACCESS_ONCE(sta_get_last_rx_stats(sta)->last_rate); - if (rate == STA_STATS_RATE_INVALID) - rinfo->flags = 0; - else + if (rate == STA_STATS_RATE_INVALID) { + rinfo->flags = 0; /* means use legacy rates */ + rinfo->legacy = 0; /* Initialize legacy rates to known value */ + } else { sta_stats_decode_rate(sta->local, rate, rinfo); + } } static void sta_set_tidstats(struct sta_info *sta,