Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 888f1564 authored by Igor Mitsyanko's avatar Igor Mitsyanko Committed by Kalle Valo
Browse files

qtnfmac: allow to control DFS slave radar detection 



In ETSI region DFS slave device can operate in two modes on DFS channels:
 - do on-channel radar detection and use higher Tx power
 - don't do radar detection and use lower Tx power as a consequence

Allow user to control that behavior through qtnfmac module parameter.

Signed-off-by: default avatarIgor Mitsyanko <igor.mitsyanko.os@quantenna.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 4f87d486

drivers/net/wireless/quantenna/qtnfmac/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ static void qtnf_cfg80211_reg_notifier(struct wiphy *wiphy, 
	pr_debug("MAC%u: initiator=%d alpha=%c%c\n", mac->macid, req->initiator,

		 req->alpha2[0], req->alpha2[1]);



	ret = qtnf_cmd_reg_notify(mac, req);

	ret = qtnf_cmd_reg_notify(mac, req, qtnf_mac_slave_radar_get(wiphy));

	if (ret) {

		pr_err("MAC%u: failed to update region to %c%c: %d\n",

		       mac->macid, req->alpha2[0], req->alpha2[1], ret);

drivers/net/wireless/quantenna/qtnfmac/commands.c

+3 −1
Original line number Diff line number Diff line
@@ -2367,7 +2367,8 @@ int qtnf_cmd_send_updown_intf(struct qtnf_vif *vif, bool up) 
	return ret;

}



int qtnf_cmd_reg_notify(struct qtnf_wmac *mac, struct regulatory_request *req)

int qtnf_cmd_reg_notify(struct qtnf_wmac *mac, struct regulatory_request *req,

			bool slave_radar)

{

	struct wiphy *wiphy = priv_to_wiphy(mac);

	struct qtnf_bus *bus = mac->bus;
@@ -2429,6 +2430,7 @@ int qtnf_cmd_reg_notify(struct qtnf_wmac *mac, struct regulatory_request *req) 
		break;

	}



	cmd->slave_radar = slave_radar;

	cmd->num_channels = 0;



	for (band = 0; band < NUM_NL80211_BANDS; band++) {

drivers/net/wireless/quantenna/qtnfmac/commands.h

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ int qtnf_cmd_send_disconnect(struct qtnf_vif *vif, 
			     u16 reason_code);

int qtnf_cmd_send_updown_intf(struct qtnf_vif *vif,

			      bool up);

int qtnf_cmd_reg_notify(struct qtnf_wmac *mac, struct regulatory_request *req);

int qtnf_cmd_reg_notify(struct qtnf_wmac *mac, struct regulatory_request *req,

			bool slave_radar);

int qtnf_cmd_get_chan_stats(struct qtnf_wmac *mac, u16 channel,

			    struct qtnf_chan_stats *stats);

int qtnf_cmd_send_chan_switch(struct qtnf_vif *vif,

drivers/net/wireless/quantenna/qtnfmac/core.c

+9 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 
#define QTNF_DMP_MAX_LEN 48

#define QTNF_PRIMARY_VIF_IDX	0



static bool slave_radar = true;

module_param(slave_radar, bool, 0644);

MODULE_PARM_DESC(slave_radar, "set 0 to disable radar detection in slave mode");



struct qtnf_frame_meta_info {

	u8 magic_s;

	u8 ifidx;
@@ -426,6 +430,11 @@ static struct qtnf_wmac *qtnf_core_mac_alloc(struct qtnf_bus *bus, 
	return mac;

}



bool qtnf_mac_slave_radar_get(struct wiphy *wiphy)

{

	return slave_radar;

}



static const struct ethtool_ops qtnf_ethtool_ops = {

	.get_drvinfo = cfg80211_get_drvinfo,

};

drivers/net/wireless/quantenna/qtnfmac/core.h

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ struct qtnf_vif *qtnf_mac_get_free_vif(struct qtnf_wmac *mac); 
struct qtnf_vif *qtnf_mac_get_base_vif(struct qtnf_wmac *mac);

void qtnf_mac_iface_comb_free(struct qtnf_wmac *mac);

void qtnf_mac_ext_caps_free(struct qtnf_wmac *mac);

bool qtnf_mac_slave_radar_get(struct wiphy *wiphy);

struct wiphy *qtnf_wiphy_allocate(struct qtnf_bus *bus);

int qtnf_core_net_attach(struct qtnf_wmac *mac, struct qtnf_vif *priv,

			 const char *name, unsigned char name_assign_type);