From owner-svn-src-user@FreeBSD.ORG Sat Aug 6 14:25:12 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E887106566C; Sat, 6 Aug 2011 14:25:12 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F38828FC1A; Sat, 6 Aug 2011 14:25:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p76EPBXN055146; Sat, 6 Aug 2011 14:25:11 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p76EPBvV055144; Sat, 6 Aug 2011 14:25:11 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108061425.p76EPBvV055144@svn.freebsd.org> From: Adrian Chadd Date: Sat, 6 Aug 2011 14:25:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224679 - user/adrian/if_ath_tx/sys/dev/ath X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2011 14:25:12 -0000 Author: adrian Date: Sat Aug 6 14:25:11 2011 New Revision: 224679 URL: http://svn.freebsd.org/changeset/base/224679 Log: The HT methods get overridden by ieee80211_ht_attach(), so we have to set them up -after- we call ieee80211_attach(). The addba setup/teardown routines are now properly being called. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Sat Aug 6 12:08:53 2011 (r224678) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Sat Aug 6 14:25:11 2011 (r224679) @@ -647,14 +647,6 @@ ath_attach(u_int16_t devid, struct ath_s | IEEE80211_HTCAP_SMPS_OFF; /* SM power save off */ ; - sc->sc_addba_request = ic->ic_addba_request; - sc->sc_addba_response = ic->ic_addba_response; - sc->sc_addba_stop = ic->ic_addba_stop; - - ic->ic_addba_request = ath_addba_request; - ic->ic_addba_response = ath_addba_response; - ic->ic_addba_stop = ath_addba_stop; - /* * Enable short-GI for HT20 only if the hardware * advertises support. @@ -737,6 +729,15 @@ ath_attach(u_int16_t devid, struct ath_s ic->ic_scan_end = ath_scan_end; ic->ic_set_channel = ath_set_channel; + /* 802.11n specific - but just override anyway */ + sc->sc_addba_request = ic->ic_addba_request; + sc->sc_addba_response = ic->ic_addba_response; + sc->sc_addba_stop = ic->ic_addba_stop; + + ic->ic_addba_request = ath_addba_request; + ic->ic_addba_response = ath_addba_response; + ic->ic_addba_stop = ath_addba_stop; + ieee80211_radiotap_attach(ic, &sc->sc_tx_th.wt_ihdr, sizeof(sc->sc_tx_th), ATH_TX_RADIOTAP_PRESENT,