From owner-svn-src-head@freebsd.org Sun Nov 6 19:16:48 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13CA1C34130; Sun, 6 Nov 2016 19:16:48 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4731C44; Sun, 6 Nov 2016 19:16:47 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA6JGkLf019565; Sun, 6 Nov 2016 19:16:46 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA6JGk5V019563; Sun, 6 Nov 2016 19:16:46 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201611061916.uA6JGk5V019563@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 6 Nov 2016 19:16:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308383 - head/sys/net80211 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2016 19:16:48 -0000 Author: adrian Date: Sun Nov 6 19:16:46 2016 New Revision: 308383 URL: https://svnweb.freebsd.org/changeset/base/308383 Log: [net80211] add a method to also explicitly tear down RX A-MPDU. The ath10k firmware API doesn't pass up the ADDBA/DELBA frames, only WMI firmware notifications. Tested: * ath10k (QCA9880), doing actual (ha!) 11n! Modified: head/sys/net80211/ieee80211_ht.c head/sys/net80211/ieee80211_ht.h Modified: head/sys/net80211/ieee80211_ht.c ============================================================================== --- head/sys/net80211/ieee80211_ht.c Sun Nov 6 18:40:12 2016 (r308382) +++ head/sys/net80211/ieee80211_ht.c Sun Nov 6 19:16:46 2016 (r308383) @@ -597,6 +597,19 @@ ieee80211_ampdu_rx_start_ext(struct ieee } /* + * Public function; manually stop the RX AMPDU state. + */ +void +ieee80211_ampdu_rx_stop_ext(struct ieee80211_node *ni, int tid) +{ + struct ieee80211_rx_ampdu *rap; + + /* XXX TODO: sanity check tid, seq, baw */ + rap = &ni->ni_rx_ampdu[tid]; + ampdu_rx_stop(ni, rap); +} + +/* * Stop A-MPDU rx processing for the specified TID. */ static void Modified: head/sys/net80211/ieee80211_ht.h ============================================================================== --- head/sys/net80211/ieee80211_ht.h Sun Nov 6 18:40:12 2016 (r308382) +++ head/sys/net80211/ieee80211_ht.h Sun Nov 6 19:16:46 2016 (r308383) @@ -220,6 +220,7 @@ void ieee80211_ht_update_beacon(struct i struct ieee80211_beacon_offsets *); int ieee80211_ampdu_rx_start_ext(struct ieee80211_node *ni, int tid, int seq, int baw); +void ieee80211_ampdu_rx_stop_ext(struct ieee80211_node *ni, int tid); int ieee80211_ampdu_tx_request_ext(struct ieee80211_node *ni, int tid); int ieee80211_ampdu_tx_request_active_ext(struct ieee80211_node *ni, int tid, int status);