diff options
| author | sam <sam@FreeBSD.org> | 2005-07-23 05:34:29 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-23 05:34:29 +0000 |
| commit | b6bb66296bf2258034b975cbeb694c5d9c0cdfa6 (patch) | |
| tree | a6c91ca2905f1f77ef9b111635227501909e4544 | |
| parent | 6d42881fd88e32a58d93a3a6279e0c6dc970a631 (diff) | |
| download | FreeBSD-src-b6bb66296bf2258034b975cbeb694c5d9c0cdfa6.zip FreeBSD-src-b6bb66296bf2258034b975cbeb694c5d9c0cdfa6.tar.gz | |
o move ath_sysctlattach down so variables it depends on are setup
o use any fixed tx antenna for beacons transmitted in adhoc mode
Submitted by: David Young
MFC after: 3 days
| -rw-r--r-- | sys/dev/ath/if_ath.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 24fd504..ef50a59 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -342,11 +342,6 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) ath_outdoor, ath_xchanmode); if (error != 0) goto bad; - /* - * Setup dynamic sysctl's now that country code and - * regdomain are available from the hal. - */ - ath_sysctlattach(sc); /* * Setup rate tables for all potential media types. @@ -587,6 +582,11 @@ ath_attach(u_int16_t devid, struct ath_softc *sc) ieee80211_media_init(ic, ath_media_change, ieee80211_media_status); ath_bpfattach(sc); + /* + * Setup dynamic sysctl's now that country code and + * regdomain are available from the hal. + */ + ath_sysctlattach(sc); if (bootverbose) ieee80211_announce(ic); @@ -1848,7 +1848,7 @@ ath_beacon_setup(struct ath_softc *sc, struct ath_buf *bf) /* * Let hardware handle antenna switching. */ - antenna = 0; + antenna = sc->sc_txantenna; } else { ds->ds_link = 0; /* |
