From patchwork Thu Jun 27 16:58:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 2794481 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 74D469F245 for ; Thu, 27 Jun 2013 16:59:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95FDD203DB for ; Thu, 27 Jun 2013 16:59:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2F87203B5 for ; Thu, 27 Jun 2013 16:59:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639Ab3F0Q7a (ORCPT ); Thu, 27 Jun 2013 12:59:30 -0400 Received: from nick.hrz.tu-chemnitz.de ([134.109.228.11]:59423 "EHLO nick.hrz.tu-chemnitz.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753423Ab3F0Q7S (ORCPT ); Thu, 27 Jun 2013 12:59:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tu-chemnitz.de; s=dkim2010; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=cLuoC3yZYvEsCDIrX60BRdhmZCCPUiJF2bk29JRcepY=; b=VbypFz7nm0oPOFWAVLmZ79XYIs/JPMOzb0QzBxLKA5eKf96xMvrmRi17YWbu5Y+6vjGfpyyutCfCt/EUTSQ3WMmHQbgdBvX5J7kV/Hm5XXPL9KaY/3LTtbPLWJfQD8q+o83FxBr4I7TJ39jUwrSQbu1XxVLjx90MUEiQnmCEnaY=; Received: from p4ffe56a3.dip0.t-ipconnect.de ([79.254.86.163] helo=pandem0nium) by nick.hrz.tu-chemnitz.de with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.80.1) (envelope-from ) id 1UsFXQ-0003hw-5p; Thu, 27 Jun 2013 18:59:16 +0200 Received: from dotslash by pandem0nium with local (Exim 4.80) (envelope-from ) id 1UsFXM-0005OY-Ev; Thu, 27 Jun 2013 18:59:12 +0200 From: Simon Wunderlich To: Johannes Berg Cc: linux-wireless@vger.kernel.org, Mathias Kretschmer , Simon Wunderlich Subject: [PATCHv5 10/18] nl80211: allow 5 and 10 MHz channels for IBSS Date: Thu, 27 Jun 2013 18:58:52 +0200 Message-Id: <1372352340-20663-12-git-send-email-siwu@hrz.tu-chemnitz.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1372352340-20663-1-git-send-email-siwu@hrz.tu-chemnitz.de> References: <1372352340-20663-1-git-send-email-siwu@hrz.tu-chemnitz.de> X-purgate: clean X-purgate-type: clean X-purgate-ID: 154106::1372352356-000004FE-BBCDC8E0/0-0/0-0 X-Scan-AV: nick.hrz.tu-chemnitz.de; 2013-06-27 18:59:16; 8e7feb1f8846165c4273914890f8d1ee X-Scan-SA: nick.hrz.tu-chemnitz.de; 2013-06-27 18:59:16; b3a3feacf46530dd47f844a726105b14 X-Spam-Score: -1.0 (-) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Whether the wiphy supports it or not is already checked, so what is left is to enable these channel types. Signed-off-by: Simon Wunderlich Signed-off-by: Mathias Kretschmer --- net/wireless/nl80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index ebd889d..10755dc 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6300,6 +6300,8 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) return -EINVAL; switch (ibss.chandef.width) { + case NL80211_CHAN_WIDTH_5: + case NL80211_CHAN_WIDTH_10: case NL80211_CHAN_WIDTH_20_NOHT: break; case NL80211_CHAN_WIDTH_20: