From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from hub022-nj-6.exch022.serverdata.net ([206.225.164.189]:56306 "EHLO HUB022-nj-6.exch022.serverdata.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753409Ab3CSLrM (ORCPT ); Tue, 19 Mar 2013 07:47:12 -0400 Message-ID: <1363693626.3355.14.camel@WLAN-SW-TEST-03> (sfid-20130319_124720_768315_7541FCFB) Subject: Re: [RFC V2 1/2] mac80211: Use a cfg80211_chan_def in ieee80211_hw_conf_chan From: Mahesh Palivela To: Karl Beldan CC: Johannes Berg , linux-wireless , Karl Beldan Date: Tue, 19 Mar 2013 17:17:06 +0530 In-Reply-To: <1363652600-23223-2-git-send-email-karl.beldan@gmail.com> References: <1363652600-23223-1-git-send-email-karl.beldan@gmail.com> <1363652600-23223-2-git-send-email-karl.beldan@gmail.com> Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tue, 2013-03-19 at 01:23 +0100, Karl Beldan wrote: > From: Karl Beldan > > Drivers that don't use chanctxes cannot perform VHT association because > they still use a "backward compatibility" pair of {ieee80211_channel, > nl80211_channel_type} in ieee80211_conf and ieee80211_local. > > FIXME: this only changes mac80211_hwsim for the RFC > > Signed-off-by: Karl Beldan > --- > drivers/net/wireless/mac80211_hwsim.c | 44 +++++++++++++++++--------- > include/net/mac80211.h | 15 +++++---- > net/mac80211/cfg.c | 7 +--- > net/mac80211/chan.c | 8 ++--- > net/mac80211/ieee80211_i.h | 3 +- > net/mac80211/main.c | 55 +++++++++++++++++++-------------- > net/mac80211/mlme.c | 20 ++++++++---- > net/mac80211/scan.c | 6 ++-- > net/mac80211/trace.h | 21 ++++++++----- > net/mac80211/tx.c | 4 +- > net/mac80211/util.c | 3 +- > 11 files changed, 107 insertions(+), 79 deletions(-) > > diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c > index 7490c4f..96e75e2 100644 > --- a/drivers/net/wireless/mac80211_hwsim.c > +++ b/drivers/net/wireless/mac80211_hwsim.c > @@ -1056,11 +1056,13 @@ out: > return HRTIMER_NORESTART; > } > > -static const char *hwsim_chantypes[] = { > - [NL80211_CHAN_NO_HT] = "noht", > - [NL80211_CHAN_HT20] = "ht20", > - [NL80211_CHAN_HT40MINUS] = "ht40-", > - [NL80211_CHAN_HT40PLUS] = "ht40+", > +static const char *hwsim_chanwidth[] = { > + [NL80211_CHAN_WIDTH_20_NOHT] = "noht", > + [NL80211_CHAN_WIDTH_20] = "ht20", > + [NL80211_CHAN_WIDTH_40] = "ht40", > + [NL80211_CHAN_WIDTH_80] = "ht80", better we call as vht80 instead of ht80. ditto below.. > + [NL80211_CHAN_WIDTH_80P80] = "ht80p80", > + [NL80211_CHAN_WIDTH_160] = "ht160", > }; > > + cfreq_off = local->csa_channel->center_freq - > + local->_oper_chandef.chan->center_freq; > + > + local->_oper_chandef.center_freq1 += cfreq_off; > + local->_oper_chandef.center_freq2 += cfreq_off; can't add cfreq_off to center_freq2. Add only in case of non-zero center_freq2? > + loca