cfg80211: remove switch from __regulatory_hint()
We have complete control over REGDOM_SET_BY_* enum passed down to __regulatory_hint() as such there is no need to account for unexpected REGDOM_SET_BY_*'s, lets just remove the switch statement as this code does not change and won't change even when we add 802.11d support. This patch has no functional changes. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
91e9900418
Коммит
5203cdb6ad
|
@ -698,34 +698,25 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
|
|||
else if (r)
|
||||
return r;
|
||||
|
||||
switch (set_by) {
|
||||
case REGDOM_SET_BY_CORE:
|
||||
case REGDOM_SET_BY_COUNTRY_IE:
|
||||
case REGDOM_SET_BY_DRIVER:
|
||||
case REGDOM_SET_BY_USER:
|
||||
request = kzalloc(sizeof(struct regulatory_request),
|
||||
GFP_KERNEL);
|
||||
if (!request)
|
||||
return -ENOMEM;
|
||||
request = kzalloc(sizeof(struct regulatory_request),
|
||||
GFP_KERNEL);
|
||||
if (!request)
|
||||
return -ENOMEM;
|
||||
|
||||
request->alpha2[0] = alpha2[0];
|
||||
request->alpha2[1] = alpha2[1];
|
||||
request->initiator = set_by;
|
||||
request->wiphy = wiphy;
|
||||
request->intersect = intersect;
|
||||
request->alpha2[0] = alpha2[0];
|
||||
request->alpha2[1] = alpha2[1];
|
||||
request->initiator = set_by;
|
||||
request->wiphy = wiphy;
|
||||
request->intersect = intersect;
|
||||
|
||||
kfree(last_request);
|
||||
last_request = request;
|
||||
r = call_crda(alpha2);
|
||||
|
||||
kfree(last_request);
|
||||
last_request = request;
|
||||
r = call_crda(alpha2);
|
||||
#ifndef CONFIG_WIRELESS_OLD_REGULATORY
|
||||
if (r)
|
||||
printk(KERN_ERR "cfg80211: Failed calling CRDA\n");
|
||||
if (r)
|
||||
printk(KERN_ERR "cfg80211: Failed calling CRDA\n");
|
||||
#endif
|
||||
break;
|
||||
default:
|
||||
r = -ENOTSUPP;
|
||||
break;
|
||||
}
|
||||
|
||||
return r;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче