Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wireless: make regdom passing semantics simpler

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

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2008-10-24 20:32:20 +02:00 committed by John W. Linville
parent 7dddaf1a36
commit d2372b3152
4 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Documentation/networking/regulatory.txt
View file

@ -167,7 +167,6 @@ struct ieee80211_regdomain mydriver_jp_regdom = {
Then in some part of your code after your wiphy has been registered: Then in some part of your code after your wiphy has been registered:
int r;
struct ieee80211_regdomain *rd; struct ieee80211_regdomain *rd;
int size_of_regd; int size_of_regd;
int num_rules = mydriver_jp_regdom.n_reg_rules; int num_rules = mydriver_jp_regdom.n_reg_rules;
@ -178,17 +177,11 @@ Then in some part of your code after your wiphy has been registered:
rd = kzalloc(size_of_regd, GFP_KERNEL); rd = kzalloc(size_of_regd, GFP_KERNEL);
if (!rd) if (!rd)
return -ENOMEM; return -ENOMEM;
memcpy(rd, &mydriver_jp_regdom, sizeof(struct ieee80211_regdomain)); 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], memcpy(&rd->reg_rules[i], &mydriver_jp_regdom.reg_rules[i],
sizeof(struct ieee80211_reg_rule)); sizeof(struct ieee80211_reg_rule));
} return regulatory_hint(hw->wiphy, NULL, rd);
r = regulatory_hint(hw->wiphy, NULL, rd);
if (r) {
kfree(rd);
return r;
}

3
include/net/wireless.h
View file

@ -358,8 +358,7 @@ ieee80211_get_channel(struct wiphy *wiphy, int freq)
* for a regulatory domain structure for the respective country. If * for a regulatory domain structure for the respective country. If
* a regulatory domain is build and passed you should set the alpha2 * 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 * 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 * the wireless core it is unknown.
* and we return non zero you are in charge of kfree()'ing the structure.
* *
* Returns -EALREADY if *a regulatory domain* has already been set. Note that * 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 * this could be by another driver. It is safe for drivers to continue if

5
net/wireless/nl80211.c
View file

@ -1935,12 +1935,9 @@ static int nl80211_set_reg(struct sk_buff *skb, struct genl_info *info)
mutex_lock(&cfg80211_drv_mutex); mutex_lock(&cfg80211_drv_mutex);
r = set_regdom(rd); r = set_regdom(rd);
mutex_unlock(&cfg80211_drv_mutex); mutex_unlock(&cfg80211_drv_mutex);
if (r)
goto bad_reg;
return r; return r;
bad_reg: bad_reg:
kfree(rd); kfree(rd);
return -EINVAL; return -EINVAL;
} }

9
net/wireless/reg.c
View file

@ -605,7 +605,6 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
return r; 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, int regulatory_hint(struct wiphy *wiphy, const char *alpha2,
struct ieee80211_regdomain *rd) struct ieee80211_regdomain *rd)
{ {
@ -690,6 +689,7 @@ void print_regdomain_info(const struct ieee80211_regdomain *rd)
print_rd_rules(rd); print_rd_rules(rd);
} }
/* Takes ownership of rd only if it doesn't fail */
static int __set_regdom(const struct ieee80211_regdomain *rd) static int __set_regdom(const struct ieee80211_regdomain *rd)
{ {
/* Some basic sanity checks first */ /* 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 /* Use this call to set the current regulatory domain. Conflicts with
* multiple drivers can be ironed out later. Caller must've already * multiple drivers can be ironed out later. Caller must've already
* kmalloc'd the rd structure. If this calls fails you should kfree() * kmalloc'd the rd structure. Caller must hold cfg80211_drv_mutex */
* the passed rd. Caller must hold cfg80211_drv_mutex */
int set_regdom(const struct ieee80211_regdomain *rd) int set_regdom(const struct ieee80211_regdomain *rd)
{ {
int r; int r;
/* Note that this doesn't update the wiphys, this is done below */ /* Note that this doesn't update the wiphys, this is done below */
r = __set_regdom(rd); r = __set_regdom(rd);
if (r) if (r) {
kfree(rd);
return r; return r;
}
/* This would make this whole thing pointless */ /* This would make this whole thing pointless */
BUG_ON(rd != cfg80211_regdomain); BUG_ON(rd != cfg80211_regdomain);