From patchwork Tue Oct 22 20:02:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Wunderlich X-Patchwork-Id: 3084681 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 9EC7ABF924 for ; Tue, 22 Oct 2013 20:12:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B2822022D for ; Tue, 22 Oct 2013 20:12:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D9DA202E6 for ; Tue, 22 Oct 2013 20:12:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754888Ab3JVUL7 (ORCPT ); Tue, 22 Oct 2013 16:11:59 -0400 Received: from packetmixer.de ([83.151.30.3]:51973 "EHLO m25s01.vlinux.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754702Ab3JVUL6 (ORCPT ); Tue, 22 Oct 2013 16:11:58 -0400 Received: from kero.packetmixer.de (p4FFE5627.dip0.t-ipconnect.de [79.254.86.39]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by m25s01.vlinux.de (Postfix) with ESMTPSA id A578950861; Tue, 22 Oct 2013 21:57:10 +0200 (CEST) From: Simon Wunderlich To: linux-wireless@vger.kernel.org Cc: Mathias Kretschmer , Dirk Gouders , Linux Kernel , Johannes Berg , Simon Wunderlich Subject: [PATCH 3.12] cfg80211: fix ibss wext chandef creation Date: Tue, 22 Oct 2013 22:02:46 +0200 Message-Id: <1382472166-19563-1-git-send-email-sw@simonwunderlich.de> X-Mailer: git-send-email 1.7.10.4 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.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 The wext internal chandefs for ibss should be created using the cfg80211_chandef_create() functions. Otherwise the center_freq1 field will not be set and cfg80211_chandef_valid() will spit a warning and report the chandef as invalid when it should be used. Reported-by: Dirk Gouders Signed-off-by: Simon Wunderlich Cc: Johannes Berg Tested-by: Dirk Gouders --- net/wireless/ibss.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 39bff7d..a710019 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -246,7 +246,7 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev, /* try to find an IBSS channel if none requested ... */ if (!wdev->wext.ibss.chandef.chan) { - wdev->wext.ibss.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; + struct ieee80211_channel *new_chan = NULL; for (band = 0; band < IEEE80211_NUM_BANDS; band++) { struct ieee80211_supported_band *sband; @@ -262,16 +262,19 @@ int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev, continue; if (chan->flags & IEEE80211_CHAN_DISABLED) continue; - wdev->wext.ibss.chandef.chan = chan; + new_chan = chan; break; } - if (wdev->wext.ibss.chandef.chan) + if (new_chan) break; } - if (!wdev->wext.ibss.chandef.chan) + if (!new_chan) return -EINVAL; + + cfg80211_chandef_create(&wdev->wext.ibss.chandef, new_chan, + NL80211_CHAN_NO_HT); } /* don't join -- SSID is not there */ @@ -345,8 +348,8 @@ int cfg80211_ibss_wext_siwfreq(struct net_device *dev, return err; if (chan) { - wdev->wext.ibss.chandef.chan = chan; - wdev->wext.ibss.chandef.width = NL80211_CHAN_WIDTH_20_NOHT; + cfg80211_chandef_create(&wdev->wext.ibss.chandef, chan, + NL80211_CHAN_NO_HT); wdev->wext.ibss.channel_fixed = true; } else { /* cfg80211_ibss_wext_join will pick one if needed */