From patchwork Mon Jul 8 14:55:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 2824928 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 345C5C0AB2 for ; Mon, 8 Jul 2013 14:56:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 203832017E for ; Mon, 8 Jul 2013 14:56:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF29D2017B for ; Mon, 8 Jul 2013 14:56:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752541Ab3GHO4X (ORCPT ); Mon, 8 Jul 2013 10:56:23 -0400 Received: from nick.hrz.tu-chemnitz.de ([134.109.228.11]:58679 "EHLO nick.hrz.tu-chemnitz.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752473Ab3GHO4V (ORCPT ); Mon, 8 Jul 2013 10:56:21 -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=7gPCVFSolbPUtSsGRGJ/9AvkaeDC2+z0kXkxmKgYRyY=; b=hzj5wme/6oBfrDZemXCjEW8azqqZjlxzTrQiZkjHhIGykwYDbDuBckxwZ0KBr3kykuw7sKHVfa6PGS2xMbH0KCpmtaQrCokbWbGshLtG3qIyhhPEwCMZGksiRJgfmcYuqEJJIk+zVLxU+CCISsZjOj8A/VoSLyfzCaXPZYdHvY4=; Received: from p4ffe4810.dip0.t-ipconnect.de ([79.254.72.16] helo=pandem0nium) by nick.hrz.tu-chemnitz.de with esmtpsa (TLSv1:DHE-RSA-AES128-SHA:128) (Exim 4.80.1) (envelope-from ) id 1UwCrT-0003B6-Ip; Mon, 08 Jul 2013 16:56:19 +0200 Received: from dotslash by pandem0nium with local (Exim 4.80) (envelope-from ) id 1UwCrQ-0003M7-3t; Mon, 08 Jul 2013 16:56:16 +0200 From: Simon Wunderlich To: Johannes Berg Cc: linux-wireless@vger.kernel.org, Mathias Kretschmer , Simon Wunderlich Subject: [PATCHv6 10/18] nl80211: allow 5 and 10 MHz channels for IBSS Date: Mon, 8 Jul 2013 16:55:58 +0200 Message-Id: <1373295366-12823-11-git-send-email-siwu@hrz.tu-chemnitz.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1373295366-12823-1-git-send-email-siwu@hrz.tu-chemnitz.de> References: <1373295366-12823-1-git-send-email-siwu@hrz.tu-chemnitz.de> X-purgate: clean X-purgate-type: clean X-purgate-ID: 154106::1373295379-000004FE-FF963B37/0-0/0-0 X-Scan-AV: nick.hrz.tu-chemnitz.de; 2013-07-08 16:56:19; 082df278550a13aea9ee511b381703aa X-Scan-SA: nick.hrz.tu-chemnitz.de; 2013-07-08 16:56:19; 89c08610738f846567e6a47a4bb0b412 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=-7.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 3019748..1318b5a 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6318,6 +6318,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: