From: Kalle Valo <kalle.valo@iki.fi>
To: linux-wireless@vger.kernel.org
Subject: [PATCH 2/2] at76c50x-usb: set firmware and hardware version in wiphy
Date: Thu, 24 Sep 2009 11:02:51 -0700 [thread overview]
Message-ID: <20090924180251.14503.64152.stgit@tikku> (raw)
In-Reply-To: <20090924180048.14503.9579.stgit@tikku>
Set firmware and hardware version in wiphy so that user space can access
it.
Signed-off-by: Kalle Valo <kalle.valo@iki.fi>
---
drivers/net/wireless/at76c50x-usb.c | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 8e1a55d..b6de657 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -2217,6 +2217,8 @@ static struct ieee80211_supported_band at76_supported_band = {
static int at76_init_new_device(struct at76_priv *priv,
struct usb_interface *interface)
{
+ struct wiphy *wiphy;
+ size_t len;
int ret;
/* set up the endpoint information */
@@ -2254,6 +2256,7 @@ static int at76_init_new_device(struct at76_priv *priv,
priv->device_unplugged = 0;
/* mac80211 initialisation */
+ wiphy = priv->hw->wiphy;
priv->hw->wiphy->max_scan_ssids = 1;
priv->hw->wiphy->max_scan_ie_len = 0;
priv->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
@@ -2265,6 +2268,18 @@ static int at76_init_new_device(struct at76_priv *priv,
SET_IEEE80211_DEV(priv->hw, &interface->dev);
SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
+ len = sizeof(wiphy->fw_version);
+ snprintf(wiphy->fw_version, len, "%d.%d.%d-%d",
+ priv->fw_version.major, priv->fw_version.minor,
+ priv->fw_version.patch, priv->fw_version.build);
+
+ len = sizeof(wiphy->hw_version);
+ snprintf(wiphy->hw_version, len, "%d", priv->board_type);
+
+ /* null terminate the strings in case they were truncated */
+ wiphy->fw_version[len - 1] = '\0';
+ wiphy->hw_version[len - 1] = '\0';
+
ret = ieee80211_register_hw(priv->hw);
if (ret) {
printk(KERN_ERR "cannot register mac80211 hw (status %d)!\n",
next prev parent reply other threads:[~2009-09-24 18:03 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-24 18:02 [PATCH 0/2] cfg80211: firmware and hardware version Kalle Valo
2009-09-24 18:02 ` [PATCH 1/2] cfg80211: add firmware and hardware version to wiphy Kalle Valo
2009-09-24 18:32 ` Luis R. Rodriguez
2009-09-24 19:14 ` Kalle Valo
2009-09-24 20:08 ` Luis R. Rodriguez
2009-09-24 18:02 ` Kalle Valo [this message]
2009-09-24 18:35 ` [PATCH 2/2] at76c50x-usb: set firmware and hardware version in wiphy Luis R. Rodriguez
2009-09-24 19:10 ` Kalle Valo
2009-09-24 20:11 ` Luis R. Rodriguez
2009-09-25 19:11 ` Kalle Valo
2009-09-25 19:27 ` Luis R. Rodriguez
2009-09-26 12:07 ` Johannes Berg
2009-09-26 13:59 ` Kalle Valo
2009-09-24 21:13 ` Joerg Albert
2009-09-25 19:06 ` Kalle Valo
2009-09-24 18:09 ` [PATCH 1/2] iw: update nl80211.h from wireless-testing Kalle Valo
2009-09-24 18:09 ` [PATCH 2/2] iw: print firmware and hardware version Kalle Valo
2009-09-24 20:20 ` [PATCH 0/2] cfg80211: " Luis R. Rodriguez
2009-09-25 4:42 ` John W. Linville
2009-09-25 16:47 ` Kalle Valo
2009-09-25 16:53 ` Luis R. Rodriguez
2009-10-01 1:13 ` John W. Linville
2009-10-01 1:19 ` [PATCH 1/3] wireless: implement basic ethtool support for cfg80211 devices John W. Linville
2009-10-01 1:19 ` [PATCH 2/3] cfg80211: add firmware and hardware version to wiphy John W. Linville
2009-10-01 1:19 ` [PATCH 3/3] at76c50x-usb: set firmware and hardware version in wiphy John W. Linville
2009-10-01 1:32 ` Ben Hutchings
2009-10-01 14:27 ` Kalle Valo
2009-10-01 1:30 ` [PATCH 1/3] wireless: implement basic ethtool support for cfg80211 devices Ben Hutchings
2009-10-01 8:51 ` Johannes Berg
2009-10-01 14:18 ` [PATCH 0/2] cfg80211: firmware and hardware version Kalle Valo
2009-10-01 15:18 ` John W. Linville
2009-10-01 15:33 ` Ben Hutchings
2009-10-01 16:56 ` John W. Linville
2009-10-01 16:20 ` Kalle Valo
2009-10-01 17:07 ` John W. Linville
2009-10-01 19:56 ` Luis R. Rodriguez
2009-10-01 20:12 ` Inaky Perez-Gonzalez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090924180251.14503.64152.stgit@tikku \
--to=kalle.valo@iki.fi \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).