From patchwork Sat Jan 29 01:05:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 516221 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0T16OeA030407 for ; Sat, 29 Jan 2011 01:06:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754727Ab1A2BF6 (ORCPT ); Fri, 28 Jan 2011 20:05:58 -0500 Received: from mail.candelatech.com ([208.74.158.172]:38399 "EHLO ns3.lanforge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754700Ab1A2BFs (ORCPT ); Fri, 28 Jan 2011 20:05:48 -0500 Received: from localhost.localdomain (firewall.candelatech.com [70.89.124.249]) by ns3.lanforge.com (8.14.2/8.14.2) with ESMTP id p0T15i3T017160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 28 Jan 2011 17:05:45 -0800 From: greearb@candelatech.com To: linux-wireless@vger.kernel.org Cc: Ben Greear Subject: [PATCH 1/3] ath9k: Show channel type in debugfs. Date: Fri, 28 Jan 2011 17:05:41 -0800 Message-Id: <1296263143-12404-1-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.7.2.3 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.6 (demeter1.kernel.org [140.211.167.41]); Sat, 29 Jan 2011 01:06:25 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index 25ea746..c3f495b 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c @@ -398,12 +398,30 @@ static const char * ath_wiphy_state_str(enum ath_wiphy_state state) return "?"; } +static const char *channel_type_str(enum nl80211_channel_type t) +{ + switch (t) { + case NL80211_CHAN_NO_HT: + return "no ht"; + case NL80211_CHAN_HT20: + return "ht20"; + case NL80211_CHAN_HT40MINUS: + return "ht40-"; + case NL80211_CHAN_HT40PLUS: + return "ht40+"; + default: + return "???"; + } +} + static ssize_t read_file_wiphy(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { struct ath_softc *sc = file->private_data; struct ath_wiphy *aphy = sc->pri_wiphy; struct ieee80211_channel *chan = aphy->hw->conf.channel; + struct ieee80211_conf *conf = &(aphy->hw->conf); + char buf[512]; unsigned int len = 0; int i; @@ -411,11 +429,12 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf, u32 tmp; len += snprintf(buf + len, sizeof(buf) - len, - "primary: %s (%s chan=%d ht=%d)\n", + "primary: %s (%s chan=%d channel-type: %d (%s))\n", wiphy_name(sc->pri_wiphy->hw->wiphy), ath_wiphy_state_str(sc->pri_wiphy->state), ieee80211_frequency_to_channel(chan->center_freq), - aphy->chan_is_ht); + conf->channel_type, + channel_type_str(conf->channel_type)); put_unaligned_le32(REG_READ_D(sc->sc_ah, AR_STA_ID0), addr); put_unaligned_le16(REG_READ_D(sc->sc_ah, AR_STA_ID1) & 0xffff, addr + 4);