From patchwork Thu Oct 1 01:19:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "John W. Linville" X-Patchwork-Id: 50806 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n911KhLi026464 for ; Thu, 1 Oct 2009 01:20:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755382AbZJABUX (ORCPT ); Wed, 30 Sep 2009 21:20:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755374AbZJABUW (ORCPT ); Wed, 30 Sep 2009 21:20:22 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:52860 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755344AbZJABUT (ORCPT ); Wed, 30 Sep 2009 21:20:19 -0400 Received: from uucp by smtp.tuxdriver.com with local-rmail (Exim 4.63) (envelope-from ) id 1MtALC-0006R2-EY; Wed, 30 Sep 2009 21:20:18 -0400 Received: from linville-t400.local (linville-t400.local [127.0.0.1]) by linville-t400.local (8.14.3/8.14.3) with ESMTP id n911J23R003523; Wed, 30 Sep 2009 21:19:02 -0400 Received: (from linville@localhost) by linville-t400.local (8.14.3/8.14.3/Submit) id n911J20r003522; Wed, 30 Sep 2009 21:19:02 -0400 From: "John W. Linville" To: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, Kalle Valo , Kalle Valo , "Luis R. Rodriguez" , "John W. Linville" Subject: [PATCH 2/3] cfg80211: add firmware and hardware version to wiphy Date: Wed, 30 Sep 2009 21:19:01 -0400 Message-Id: <1254359942-3483-2-git-send-email-linville@tuxdriver.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1254359942-3483-1-git-send-email-linville@tuxdriver.com> References: <20091001011340.GA3123@tuxdriver.com> <1254359942-3483-1-git-send-email-linville@tuxdriver.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 241ea14..6f4862b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1142,6 +1142,9 @@ struct wiphy { u32 frag_threshold; u32 rts_threshold; + char fw_version[ETHTOOL_BUSINFO_LEN]; + u32 hw_version; + /* If multiple wiphys are registered and you're handed e.g. * a regular netdev with assigned ieee80211_ptr, you won't * know whether it points to a wiphy your driver has registered diff --git a/net/wireless/ethtool.c b/net/wireless/ethtool.c index 94ca377..3c59549 100644 --- a/net/wireless/ethtool.c +++ b/net/wireless/ethtool.c @@ -4,6 +4,8 @@ const struct ethtool_ops cfg80211_ethtool_ops = { .get_drvinfo = cfg80211_get_drvinfo, + .get_regs_len = cfg80211_get_regs_len, + .get_regs = cfg80211_get_regs, .get_link = ethtool_op_get_link, }; @@ -18,10 +20,29 @@ void cfg80211_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) strncpy(info->version, UTS_RELEASE, sizeof(info->version)); info->version[sizeof(info->version) - 1] = '\0'; - strncpy(info->fw_version, "N/A", sizeof(info->fw_version)); + if (wdev->wiphy->fw_version[0]) + strncpy(info->fw_version, wdev->wiphy->fw_version, + sizeof(info->fw_version)); + else + strncpy(info->fw_version, "N/A", sizeof(info->fw_version)); info->fw_version[sizeof(info->fw_version) - 1] = '\0'; strncpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)), sizeof(info->bus_info)); info->bus_info[sizeof(info->bus_info) - 1] = '\0'; } + +int cfg80211_get_regs_len(struct net_device *dev) +{ + /* For now, return 0... */ + return 0; +} + +void cfg80211_get_regs(struct net_device *dev, struct ethtool_regs *regs, + void *data) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + + regs->version = wdev->wiphy->hw_version; + regs->len = 0; +} diff --git a/net/wireless/ethtool.h b/net/wireless/ethtool.h index a51b470..2d4602a 100644 --- a/net/wireless/ethtool.h +++ b/net/wireless/ethtool.h @@ -4,6 +4,9 @@ #include extern void cfg80211_get_drvinfo(struct net_device *, struct ethtool_drvinfo *); +extern int cfg80211_get_regs_len(struct net_device *); +extern void cfg80211_get_regs(struct net_device *, struct ethtool_regs *, + void *); extern const struct ethtool_ops cfg80211_ethtool_ops;