On Tue, 2008-11-04 at 18:50 -0800, Luis R. Rodriguez wrote:
> 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@xxxxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> ---
> net/wireless/reg.c | 43 +++++++++++++++++--------------------------
> 1 files changed, 17 insertions(+), 26 deletions(-)
>
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index 7a2ce27..e44f005 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -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->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);
> + 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;
> +
> + 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;
> }
Attachment:
signature.asc
Description: This is a digitally signed message part
