Commit d2372b31 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

wireless: make regdom passing semantics simpler 



The regdom struct is given to the core, so it might as well
free it in error conditions.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7dddaf1a

Documentation/networking/regulatory.txt

+3 −10
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ struct ieee80211_regdomain mydriver_jp_regdom = { 


Then in some part of your code after your wiphy has been registered:



	int r;

	struct ieee80211_regdomain *rd;

	int size_of_regd;

	int num_rules = mydriver_jp_regdom.n_reg_rules;
@@ -182,13 +181,7 @@ Then in some part of your code after your wiphy has been registered: 


	memcpy(rd, &mydriver_jp_regdom, sizeof(struct ieee80211_regdomain));



	for (i=0; i < num_rules; i++) {

	for (i=0; i < num_rules; i++)

		memcpy(&rd->reg_rules[i], &mydriver_jp_regdom.reg_rules[i],

			sizeof(struct ieee80211_reg_rule));

	}

	r = regulatory_hint(hw->wiphy, NULL, rd);

	if (r) {

		kfree(rd);

		return r;

	}

	return regulatory_hint(hw->wiphy, NULL, rd);

include/net/wireless.h

+1 −2
Original line number Diff line number Diff line
@@ -358,8 +358,7 @@ ieee80211_get_channel(struct wiphy *wiphy, int freq) 
 * for a regulatory domain structure for the respective country. If

 * a regulatory domain is build and passed you should set the alpha2

 * if possible, otherwise set it to the special value of "99" which tells

 * the wireless core it is unknown. If you pass a built regulatory domain

 * and we return non zero you are in charge of kfree()'ing the structure.

 * the wireless core it is unknown.

 *

 * Returns -EALREADY if *a regulatory domain* has already been set. Note that

 * this could be by another driver. It is safe for drivers to continue if

net/wireless/nl80211.c

+1 −4
Original line number Diff line number Diff line
@@ -1935,9 +1935,6 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info) 
	mutex_lock(&cfg80211_drv_mutex);

	r = set_regdom(rd);

	mutex_unlock(&cfg80211_drv_mutex);

	if (r)

		goto bad_reg;



	return r;



 bad_reg:

net/wireless/reg.c

+5 −4
Original line number Diff line number Diff line
@@ -605,7 +605,6 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by, 
	return r;

}



/* If rd is not NULL and if this call fails the caller must free it */

int regulatory_hint(struct wiphy *wiphy, const char *alpha2,

	struct ieee80211_regdomain *rd)

{
@@ -690,6 +689,7 @@ void print_regdomain_info(const struct ieee80211_regdomain *rd) 
	print_rd_rules(rd);

}



/* Takes ownership of rd only if it doesn't fail */

static int __set_regdom(const struct ieee80211_regdomain *rd)

{

	/* Some basic sanity checks first */
@@ -750,16 +750,17 @@ static int __set_regdom(const struct ieee80211_regdomain *rd) 


/* Use this call to set the current regulatory domain. Conflicts with

 * multiple drivers can be ironed out later. Caller must've already

 * kmalloc'd the rd structure. If this calls fails you should kfree()

 * the passed rd. Caller must hold cfg80211_drv_mutex */

 * kmalloc'd the rd structure. Caller must hold cfg80211_drv_mutex */

int set_regdom(const struct ieee80211_regdomain *rd)

{

	int r;



	/* Note that this doesn't update the wiphys, this is done below */

	r = __set_regdom(rd);

	if (r)

	if (r) {

		kfree(rd);

		return r;

	}



	/* This would make this whole thing pointless */

	BUG_ON(rd != cfg80211_regdomain);