From owner-svn-src-stable@freebsd.org Thu Mar 1 15:21:53 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03C8AF34600; Thu, 1 Mar 2018 15:21:53 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA83D6BF59; Thu, 1 Mar 2018 15:21:52 +0000 (UTC) (envelope-from eadler@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B52D270C; Thu, 1 Mar 2018 15:21:52 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w21FLqbe027086; Thu, 1 Mar 2018 15:21:52 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w21FLqOl027084; Thu, 1 Mar 2018 15:21:52 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201803011521.w21FLqOl027084@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Thu, 1 Mar 2018 15:21:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r330241 - stable/11/sys/net80211 X-SVN-Group: stable-11 X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: stable/11/sys/net80211 X-SVN-Commit-Revision: 330241 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Mar 2018 15:21:53 -0000 Author: eadler Date: Thu Mar 1 15:21:52 2018 New Revision: 330241 URL: https://svnweb.freebsd.org/changeset/base/330241 Log: Revert MFC of r330233 This was an additional commit that I did not intend to MFC... and also broke the build Pointy Hat To: me Modified: stable/11/sys/net80211/ieee80211_input.h stable/11/sys/net80211/ieee80211_ioctl.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/net80211/ieee80211_input.h ============================================================================== --- stable/11/sys/net80211/ieee80211_input.h Thu Mar 1 14:11:07 2018 (r330240) +++ stable/11/sys/net80211/ieee80211_input.h Thu Mar 1 15:21:52 2018 (r330241) @@ -131,39 +131,7 @@ ishtinfooui(const uint8_t *frm) return frm[1] > 3 && le32dec(frm+2) == ((BCM_OUI_HTINFO<<24)|BCM_OUI); } -static __inline int -ieee80211_check_rxseq_amsdu(const struct ieee80211_rx_stats *rxs) -{ - - return (!! (rxs->c_pktflags & IEEE80211_RX_F_AMSDU)); -} - /* - * Return 1 if the rxseq check should increment the sequence - * number. Return 0 if it's part of an AMSDU batch and it isn't - * the final frame in the decap'ed burst. - */ -static __inline int -ieee80211_check_rxseq_amsdu_more(const struct ieee80211_rx_stats *rxs) -{ - /* No state? ok */ - if (rxs == NULL) - return (1); - - /* State but no AMSDU set? ok */ - if ((rxs->c_pktflags & IEEE80211_RX_F_AMSDU) == 0) - return (1); - - /* State, AMSDU set, then _MORE means "don't inc yet" */ - if (rxs->c_pktflags & IEEE80211_RX_F_AMSDU_MORE) { - return (0); - } - - /* Both are set, so return ok */ - return (1); -} - -/* * Check the current frame sequence number against the current TID * state and return whether it's in sequence or should be dropped. * @@ -257,20 +225,7 @@ ieee80211_check_rxseq(struct ieee80211_node *ni, struc goto fail; ok: - /* - * Only bump the sequence number if it's the last frame - * in a batch. That way frames in the rest of the batch - * get included, and the last frame in the batch kicks - * it next. - */ - if (ieee80211_check_rxseq_amsdu_more(rxs)) { - ni->ni_rxseqs[tid] = rxseq; - if ((rxs != NULL) && ieee80211_check_rxseq_amsdu(rxs)) - IEEE80211_NODE_STAT(ni, rx_amsdu_more_end); - } else { - /* .. still waiting */ - IEEE80211_NODE_STAT(ni, rx_amsdu_more); - } + ni->ni_rxseqs[tid] = rxseq; return 1; Modified: stable/11/sys/net80211/ieee80211_ioctl.h ============================================================================== --- stable/11/sys/net80211/ieee80211_ioctl.h Thu Mar 1 14:11:07 2018 (r330240) +++ stable/11/sys/net80211/ieee80211_ioctl.h Thu Mar 1 15:21:52 2018 (r330241) @@ -84,11 +84,7 @@ struct ieee80211_nodestats { uint32_t ns_tx_deauth_code; /* last deauth reason */ uint32_t ns_tx_disassoc; /* disassociations */ uint32_t ns_tx_disassoc_code; /* last disassociation reason */ - - /* Hardware A-MSDU decode */ - uint32_t ns_rx_amsdu_more; /* RX decap A-MSDU, more coming from A-MSDU */ - uint32_t ns_rx_amsdu_more_end; /* RX decap A-MSDU (or any other frame), no more coming */ - uint32_t ns_spare[6]; + uint32_t ns_spare[8]; }; /*