From patchwork Sun May 2 14:12:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit PAPILLAULT X-Patchwork-Id: 96368 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o42G8dCF007072 for ; Sun, 2 May 2010 16:08:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757928Ab0EBQIR (ORCPT ); Sun, 2 May 2010 12:08:17 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:44088 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757913Ab0EBQIO (ORCPT ); Sun, 2 May 2010 12:08:14 -0400 Received: from smtp3-g21.free.fr (localhost [127.0.0.1]) by smtp3-g21.free.fr (Postfix) with ESMTP id C8E598180D7; Sun, 2 May 2010 18:08:07 +0200 (CEST) Received: from benoit-laptop (ns.popipo.fr [88.163.232.53]) by smtp3-g21.free.fr (Postfix) with ESMTP id 96FF0818028; Sun, 2 May 2010 18:08:04 +0200 (CEST) Received: by benoit-laptop (Postfix, from userid 1000) id 929FB1DE047; Sun, 2 May 2010 16:12:17 +0200 (CEST) From: Benoit Papillault To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Benoit Papillault Subject: [RFC] ibss: Added channel type in order to create HT IBSS Date: Sun, 2 May 2010 16:12:08 +0200 Message-Id: <1272809528-11000-1-git-send-email-benoit.papillault@free.fr> X-Mailer: git-send-email 1.7.0.4 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 02 May 2010 16:08:39 +0000 (UTC) diff --git a/ibss.c b/ibss.c index 4715ac8..4003a38 100644 --- a/ibss.c +++ b/ibss.c @@ -18,6 +18,15 @@ static int join_ibss(struct nl80211_state *state, { char *end; unsigned char abssid[6]; + int i; + static const struct { + const char *name; + unsigned int val; + } htmap[] = { + { .name = "HT20", .val = NL80211_CHAN_HT20, }, + { .name = "HT40+", .val = NL80211_CHAN_HT40PLUS, }, + { .name = "HT40-", .val = NL80211_CHAN_HT40MINUS, }, + }; if (argc < 2) return 1; @@ -52,6 +61,22 @@ static int join_ibss(struct nl80211_state *state, if (!argc) return 0; + if (argc) { + for (i = 0; i < ARRAY_SIZE(htmap); i++) { + if (strcasecmp(htmap[i].name, argv[1]) == 0) { + NLA_PUT_U32(msg, + NL80211_ATTR_WIPHY_CHANNEL_TYPE, + htmap[i].val); + argv++; + argc--; + break; + } + } + } + + if (!argc) + return 0; + if (strcmp(*argv, "key") != 0 && strcmp(*argv, "keys") != 0) return 1; @@ -73,7 +98,7 @@ static int leave_ibss(struct nl80211_state *state, COMMAND(ibss, leave, NULL, NL80211_CMD_LEAVE_IBSS, 0, CIB_NETDEV, leave_ibss, "Leave the current IBSS cell."); -COMMAND(ibss, join, " [fixed-freq] [] [key d:0:abcde]", +COMMAND(ibss, join, " [HT20|HT40+|HT40-] [fixed-freq] [] [key d:0:abcde]", NL80211_CMD_JOIN_IBSS, 0, CIB_NETDEV, join_ibss, "Join the IBSS cell with the given SSID, if it doesn't exist create\n" "it on the given frequency. When fixed frequency is requested, don't\n"