svn commit: r224679 - user/adrian/if_ath_tx/sys/dev/ath

[Adrian Chadd]

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,