On Tue, 2008-11-04 at 18:50 -0800, Luis R. Rodriguez wrote:
> We have control over the REGDOM_SET_BY_* macros passed
> so remove the switch.
>
> This patch has no functional changes.
>
> Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
Acked-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> ---
> net/wireless/reg.c | 21 ++++++---------------
> 1 files changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/net/wireless/reg.c b/net/wireless/reg.c
> index e44f005..290ecec 100644
> --- a/net/wireless/reg.c
> +++ b/net/wireless/reg.c
> @@ -829,21 +829,12 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
> reset_regdomains();
>
> /* Country IE parsing coming soon */
> - switch (last_request->initiator) {
> - case REGDOM_SET_BY_CORE:
> - case REGDOM_SET_BY_DRIVER:
> - case REGDOM_SET_BY_USER:
> - if (!is_valid_rd(rd)) {
> - printk(KERN_ERR "cfg80211: Invalid "
> - "regulatory domain detected:\n");
> - print_regdomain_info(rd);
> - return -EINVAL;
> - }
> - break;
> - case REGDOM_SET_BY_COUNTRY_IE: /* Not yet */
> - WARN_ON(1);
> - default:
> - return -EOPNOTSUPP;
> +
> + if (!is_valid_rd(rd)) {
> + printk(KERN_ERR "cfg80211: Invalid "
> + "regulatory domain detected:\n");
> + print_regdomain_info(rd);
> + return -EINVAL;
> }
>
> if (unlikely(last_request->intersect)) {
Attachment:
signature.asc
Description: This is a digitally signed message part
