leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cfg80211: remove switch from __regulatory_hint()

Browse Source 
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:
Luis R. Rodriguez 2008-11-12 14:21:56 -08:00 committed by John W. Linville
parent 91e9900418
commit 5203cdb6ad
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
net/wireless/reg.c
View File

@ -698,34 +698,25 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
else if (r) else if (r)
return r; return r;
switch (set_by) { request = kzalloc(sizeof(struct regulatory_request),
case REGDOM_SET_BY_CORE: GFP_KERNEL);
case REGDOM_SET_BY_COUNTRY_IE: if (!request)
case REGDOM_SET_BY_DRIVER: return -ENOMEM;
case REGDOM_SET_BY_USER:
request = kzalloc(sizeof(struct regulatory_request),
GFP_KERNEL);
if (!request)
return -ENOMEM;
request->alpha2[0] = alpha2[0]; request->alpha2[0] = alpha2[0];
request->alpha2[1] = alpha2[1]; request->alpha2[1] = alpha2[1];
request->initiator = set_by; request->initiator = set_by;
request->wiphy = wiphy; request->wiphy = wiphy;
request->intersect = intersect; 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 #ifndef CONFIG_WIRELESS_OLD_REGULATORY
if (r) if (r)
printk(KERN_ERR "cfg80211: Failed calling CRDA\n"); printk(KERN_ERR "cfg80211: Failed calling CRDA\n");
#endif #endif
break;
default:
r = -ENOTSUPP;
break;
}
return r; return r;
} }