31c31
< __FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 190526 2009-03-29 17:59:14Z sam $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 190571 2009-03-30 19:23:49Z sam $");
41a42
> #include "opt_wlan.h"
73c74
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
216c217
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
258c259
< #endif /* ATH_SUPPORT_TDMA */
---
> #endif /* IEEE80211_SUPPORT_TDMA */
661c662
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
890c891
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
1015c1016
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
1121c1122
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
1282c1283
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
1629c1630
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4279c4280
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4454c4455
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4488c4489
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4678c4679
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4748c4749
< #endif /* ATH_SUPPORT_TDMA */
---
> #endif /* IEEE80211_SUPPORT_TDMA */
4983c4984
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
5225c5226
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
5936c5937
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
5970c5971
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
6038c6039
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
6546c6547
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
6836c6837
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
6850c6851
< #endif /* ATH_SUPPORT_TDMA */
---
> #endif /* IEEE80211_SUPPORT_TDMA */
6949c6950
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
7288c7289
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
7648c7649
< #endif /* ATH_SUPPORT_TDMA */
---
> #endif /* IEEE80211_SUPPORT_TDMA */
< __FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 190526 2009-03-29 17:59:14Z sam $");
---
> __FBSDID("$FreeBSD: head/sys/dev/ath/if_ath.c 190571 2009-03-30 19:23:49Z sam $");
41a42
> #include "opt_wlan.h"
73c74
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
216c217
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
258c259
< #endif /* ATH_SUPPORT_TDMA */
---
> #endif /* IEEE80211_SUPPORT_TDMA */
661c662
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
890c891
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
1015c1016
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
1121c1122
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
1282c1283
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
1629c1630
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4279c4280
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4454c4455
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4488c4489
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4678c4679
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
4748c4749
< #endif /* ATH_SUPPORT_TDMA */
---
> #endif /* IEEE80211_SUPPORT_TDMA */
4983c4984
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
5225c5226
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
5936c5937
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
5970c5971
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
6038c6039
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
6546c6547
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
6836c6837
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
6850c6851
< #endif /* ATH_SUPPORT_TDMA */
---
> #endif /* IEEE80211_SUPPORT_TDMA */
6949c6950
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
7288c7289
< #ifdef ATH_SUPPORT_TDMA
---
> #ifdef IEEE80211_SUPPORT_TDMA
7648c7649
< #endif /* ATH_SUPPORT_TDMA */
---
> #endif /* IEEE80211_SUPPORT_TDMA */