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

Commit 0fee54ca authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

cfg80211: remove REGDOM_SET_BY_INIT 



This is not used as we can always just assume the first
regulatory domain set will _always_ be a static regulatory
domain. REGDOM_SET_BY_CORE will be the first request from
cfg80211 for a regdomain and that then populates the first
regulatory request.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1a28c78b

drivers/net/wireless/ath9k/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1670,7 +1670,7 @@ int ath_attach(u16 devid, struct ath_softc *sc) 
	}

	wiphy_apply_custom_regulatory(hw->wiphy, regd);

	ath9k_reg_apply_radar_flags(hw->wiphy);

	ath9k_reg_apply_world_flags(hw->wiphy, REGDOM_SET_BY_INIT);

	ath9k_reg_apply_world_flags(hw->wiphy, REGDOM_SET_BY_DRIVER);



	INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);

	INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work);

drivers/net/wireless/ath9k/regd.c

+0 −1
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ int ath9k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) 


	switch (request->initiator) {

	case REGDOM_SET_BY_DRIVER:

	case REGDOM_SET_BY_INIT:

	case REGDOM_SET_BY_CORE:

	case REGDOM_SET_BY_USER:

		break;

include/net/cfg80211.h

+0 −3
Original line number Diff line number Diff line
@@ -350,8 +350,6 @@ struct bss_parameters { 


/**

 * enum reg_set_by - Indicates who is trying to set the regulatory domain

 * @REGDOM_SET_BY_INIT: regulatory domain was set by initialization. We will be

 * 	using a static world regulatory domain by default.

 * @REGDOM_SET_BY_CORE: Core queried CRDA for a dynamic world regulatory domain.

 * @REGDOM_SET_BY_USER: User asked the wireless core to set the

 * 	regulatory domain.
@@ -362,7 +360,6 @@ struct bss_parameters { 
 *	should consider.

 */

enum reg_set_by {

	REGDOM_SET_BY_INIT,

	REGDOM_SET_BY_CORE,

	REGDOM_SET_BY_USER,

	REGDOM_SET_BY_DRIVER,

net/wireless/reg.c

+0 −2
Original line number Diff line number Diff line
@@ -1255,8 +1255,6 @@ static int ignore_request(struct wiphy *wiphy, 
		return 0;



	switch (pending_request->initiator) {

	case REGDOM_SET_BY_INIT:

		return -EINVAL;

	case REGDOM_SET_BY_CORE:

		return -EINVAL;

	case REGDOM_SET_BY_COUNTRY_IE: