Skip to content

athp: regdomain setting #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bzfbd wants to merge 1 commit into
base: master
Choose a base branch
from
Open

athp: regdomain setting #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions otus/freebsd/src/sys/dev/athp/if_athp_mac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3859,7 +3859,7 @@ static int ath10k_update_channel_list(struct ath10k *ar)
* Note: this is the FreeBSD specific implementation of
* the channel list function.
*/
int
static int
ath10k_update_channel_list_freebsd(struct ath10k *ar, int nchans,
struct ieee80211_channel *chans)
{
Expand Down Expand Up @@ -3975,7 +3975,7 @@ ath10k_mac_get_dfs_region(enum nl80211_dfs_regions dfs_region)
*/
void
ath10k_regd_update(struct ath10k *ar, int nchans,
struct ieee80211_channel *chans)
struct ieee80211_channel *chans, struct ieee80211_regdomain *reg)
{
#if 0
struct reg_dmn_pair_mapping *regpair;
Expand Down Expand Up @@ -4017,11 +4017,12 @@ ath10k_regd_update(struct ath10k *ar, int nchans,
regpair->reg_2ghz_ctl,
regpair->reg_5ghz_ctl,
wmi_dfs_reg);
#else
ret = ath10k_wmi_pdev_set_regdomain(ar, 0x0, 0x0, 0x0, /* CUS223E bringup code, regdomain 0 */
0x1ff, 0x1ff, /* DEBUG_REG_DMN */
wmi_dfs_reg);
#endif
ret = ath10k_wmi_pdev_set_regdomain(ar, reg->regdomain, reg->regdomain,
reg->regdomain, 0x1ff, 0x1ff, wmi_dfs_reg);
if (ret)
ath10k_warn(ar, "failed to set pdev regdomain: %d\n", ret);
}
Expand Down Expand Up @@ -5211,7 +5212,7 @@ int ath10k_start(struct ath10k *ar)
ar->ani_enabled = true;

ar->num_started_vdevs = 0;
ath10k_regd_update(ar, ic->ic_nchans, ic->ic_channels);
ath10k_regd_update(ar, ic->ic_nchans, ic->ic_channels, &ic->ic_regdomain);

ath10k_spectral_start(ar);
ath10k_thermal_set_throttling(ar);
Expand Down
5 changes: 2 additions & 3 deletions otus/freebsd/src/sys/dev/athp/if_athp_mac2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ extern int ath10k_add_interface(struct ath10k *ar, struct ieee80211vap *vif,
const uint8_t mac[IEEE80211_ADDR_LEN]);
extern void ath10k_remove_interface(struct ath10k *ar, struct ieee80211vap *vif);

extern int ath10k_update_channel_list_freebsd(struct ath10k *ar,
int nchans, struct ieee80211_channel *chans);
extern void ath10k_regd_update(struct ath10k *ar,
int nchans, struct ieee80211_channel *chans);
int nchans, struct ieee80211_channel *chans,
struct ieee80211_regdomain *);

/* key management */
extern bool ath10k_mac_is_peer_wep_key_set(struct ath10k *ar, const u8 *addr, u8 keyidx);
Expand Down
2 changes: 1 addition & 1 deletion otus/freebsd/src/sys/dev/athp/if_athp_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2282,7 +2282,7 @@ athp_set_regdomain(struct ieee80211com *ic, struct ieee80211_regdomain *reg,
IEEE80211_UNLOCK(ic);
ATHP_CONF_LOCK(ar);
if (ar->state == ATH10K_STATE_ON)
(void) ath10k_regd_update(ar, nchans, chans);
(void) ath10k_regd_update(ar, nchans, chans, reg);
ATHP_CONF_UNLOCK(ar);
IEEE80211_LOCK(ic);

Expand Down