From patchwork Tue May 4 06:47:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit PAPILLAULT X-Patchwork-Id: 96678 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 o446lDIX024107 for ; Tue, 4 May 2010 06:47:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756108Ab0EDGrL (ORCPT ); Tue, 4 May 2010 02:47:11 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:51205 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755923Ab0EDGrK (ORCPT ); Tue, 4 May 2010 02:47:10 -0400 Received: from smtp3-g21.free.fr (localhost [127.0.0.1]) by smtp3-g21.free.fr (Postfix) with ESMTP id A1F738180AC; Tue, 4 May 2010 08:47:04 +0200 (CEST) Received: from xian.sabine-et-benoit.com (ns.popipo.fr [88.163.232.53]) by smtp3-g21.free.fr (Postfix) with ESMTP; Tue, 4 May 2010 08:47:02 +0200 (CEST) Received: by xian.sabine-et-benoit.com (Postfix, from userid 1000) id B73BF7020C; Tue, 4 May 2010 08:47:02 +0200 (CEST) From: Benoit Papillault To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Benoit Papillault Subject: [PATCH] cfg80211: Check for channel HT capabilities in an IBSS Date: Tue, 4 May 2010 08:47:01 +0200 Message-Id: <1272955622-6987-2-git-send-email-benoit.papillault@free.fr> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1272955622-6987-1-git-send-email-benoit.papillault@free.fr> References: <1272955622-6987-1-git-send-email-benoit.papillault@free.fr> 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]); Tue, 04 May 2010 06:47:14 +0000 (UTC) diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 8da9823..0a82623 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3858,11 +3858,11 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) ibss.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]); } - ibss.channel = ieee80211_get_channel(wiphy, - nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ])); + ibss.channel = rdev_freq_to_chan(rdev, + nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]), + channel_type); if (!ibss.channel || - ibss.channel->flags & IEEE80211_CHAN_NO_IBSS || - ibss.channel->flags & IEEE80211_CHAN_DISABLED) { + ibss.channel->flags & IEEE80211_CHAN_NO_IBSS) { err = -EINVAL; goto out; }