From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
To: "ext John W. Linville" <linville@tuxdriver.com>
Cc: "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"Coelho Luciano (Nokia-MS/Helsinki)" <Luciano.Coelho@nokia.com>
Subject: Re: [PATCH] wl1271: update hw/fw version info in wiphy struct
Date: Thu, 29 Jul 2010 08:01:52 +0300 [thread overview]
Message-ID: <1280379712.6475.79.camel@wimaxnb.nmp.nokia.com> (raw)
In-Reply-To: <1280351443-28535-1-git-send-email-linville@tuxdriver.com>
On Wed, 2010-07-28 at 23:10 +0200, ext John W. Linville wrote:
> This makes the information available through ethtool...
>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
> ---
> drivers/net/wireless/wl12xx/wl1271_main.c | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
> index 374abf0..9d68f00 100644
> --- a/drivers/net/wireless/wl12xx/wl1271_main.c
> +++ b/drivers/net/wireless/wl12xx/wl1271_main.c
> @@ -839,6 +839,7 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
> struct ieee80211_vif *vif)
> {
> struct wl1271 *wl = hw->priv;
> + struct wiphy *wiphy = hw->wiphy;
> int retries = WL1271_BOOT_RETRIES;
> int ret = 0;
>
> @@ -892,6 +893,12 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
>
> wl->state = WL1271_STATE_ON;
> wl1271_info("firmware booted (%s)", wl->chip.fw_ver);
> +
> + /* update hw/fw version info in wiphy struct */
> + wiphy->hw_version = wl->chip.id;
> + strncpy(wiphy->fw_version, wl->chip.fw_ver,
> + sizeof(wiphy->fw_version));
> +
> goto out;
>
> irq_disable:
Acked-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
-Juuso
prev parent reply other threads:[~2010-07-29 5:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-28 21:10 [PATCH] wl1271: update hw/fw version info in wiphy struct John W. Linville
2010-07-29 5:01 ` Juuso Oikarinen [this message]
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=1280379712.6475.79.camel@wimaxnb.nmp.nokia.com \
--to=juuso.oikarinen@nokia.com \
--cc=Luciano.Coelho@nokia.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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).