* [PATCH] wl1271: update hw/fw version info in wiphy struct
@ 2010-07-28 21:10 John W. Linville
2010-07-29 5:01 ` Juuso Oikarinen
0 siblings, 1 reply; 2+ messages in thread
From: John W. Linville @ 2010-07-28 21:10 UTC (permalink / raw)
To: linux-wireless; +Cc: Luciano Coelho, Juuso Oikarinen, John W. Linville
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:
--
1.7.1.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] wl1271: update hw/fw version info in wiphy struct
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
0 siblings, 0 replies; 2+ messages in thread
From: Juuso Oikarinen @ 2010-07-29 5:01 UTC (permalink / raw)
To: ext John W. Linville; +Cc: linux-wireless, Coelho Luciano (Nokia-MS/Helsinki)
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-07-29 5:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).