From patchwork Mon Nov 7 14:59:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Berg X-Patchwork-Id: 9415351 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C392060585 for ; Mon, 7 Nov 2016 15:00:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B763F28C42 for ; Mon, 7 Nov 2016 15:00:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC62028C4E; Mon, 7 Nov 2016 15:00:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62E3028C42 for ; Mon, 7 Nov 2016 15:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932314AbcKGO77 (ORCPT ); Mon, 7 Nov 2016 09:59:59 -0500 Received: from s3.sipsolutions.net ([5.9.151.49]:36806 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932284AbcKGO75 (ORCPT ); Mon, 7 Nov 2016 09:59:57 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from ) id 1c3lOs-00031L-8k; Mon, 07 Nov 2016 15:59:54 +0100 From: Benjamin Berg To: Johannes Berg Cc: linux-wireless@vger.kernel.org, sw@simonwunderlich.de, Benjamin Berg , Benjamin Berg Subject: [PATCH 4/8] mesh: Use common freqchan helper for joining a mesh Date: Mon, 7 Nov 2016 15:59:39 +0100 Message-Id: <20161107145943.16761-5-benjamin@sipsolutions.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161107145943.16761-1-benjamin@sipsolutions.net> References: <20161107145943.16761-1-benjamin@sipsolutions.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Simplify code by using the helper which has been introduced earlier. Signed-off-by: Benjamin Berg --- mesh.c | 67 +++++++++++------------------------------------------------------- 1 file changed, 11 insertions(+), 56 deletions(-) diff --git a/mesh.c b/mesh.c index a0047fe..97f236b 100644 --- a/mesh.c +++ b/mesh.c @@ -446,31 +446,6 @@ static int join_mesh(struct nl80211_state *state, unsigned char rates[NL80211_MAX_SUPP_RATES]; int bintval, dtim_period, n_rates = 0; char *end, *value = NULL, *sptr = NULL; - unsigned int i; - unsigned long freq = 0; - const struct chanmode *chanmode_selected = NULL; - static const struct chanmode chanmode[] = { - { .name = "HT20", - .width = NL80211_CHAN_WIDTH_20, - .freq1_diff = 0, - .chantype = NL80211_CHAN_HT20 }, - { .name = "HT40+", - .width = NL80211_CHAN_WIDTH_40, - .freq1_diff = 10, - .chantype = NL80211_CHAN_HT40PLUS }, - { .name = "HT40-", - .width = NL80211_CHAN_WIDTH_40, - .freq1_diff = -10, - .chantype = NL80211_CHAN_HT40MINUS }, - { .name = "NOHT", - .width = NL80211_CHAN_WIDTH_20_NOHT, - .freq1_diff = 0, - .chantype = NL80211_CHAN_NO_HT }, - { .name = "80MHz", - .width = NL80211_CHAN_WIDTH_80, - .freq1_diff = 0, - .chantype = -1 }, - }; if (argc < 1) return 1; @@ -481,40 +456,20 @@ static int join_mesh(struct nl80211_state *state, /* freq */ if (argc > 1 && strcmp(argv[0], "freq") == 0) { - argv++; - argc--; - - freq = strtoul(argv[0], &end, 10); - if (*end != '\0') - return 1; - NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq); - - argv++; - argc--; - } + struct chandef chandef; + int err, parsed; - /* channel type */ - if (argc) { - for (i = 0; i < ARRAY_SIZE(chanmode); i++) { - if (strcasecmp(chanmode[i].name, argv[0]) == 0) { - chanmode_selected = &chanmode[i]; - break; - } - } + err = parse_freqchan(&chandef, false, argc - 1, argv + 1, + &parsed); + if (err) + return err; - if (chanmode_selected) { - NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH, - chanmode_selected->width); - NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1, - get_cf1(chanmode_selected, freq)); - if (chanmode_selected->chantype != -1) - NLA_PUT_U32(msg, - NL80211_ATTR_WIPHY_CHANNEL_TYPE, - chanmode_selected->chantype); + argv += parsed + 1; + argc -= parsed + 1; - argv++; - argc--; - } + put_chandef(msg, &chandef); + if (err) + return err; } /* basic rates */