2010-07-28 21:15:24

by John W. Linville

Subject: [PATCH] wl1271: update hw/fw version info in wiphy struct

This makes the information available through ethtool...

Signed-off-by: John W. Linville <[email protected]>
---
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

2010-07-29 05:42:50

by Juuso Oikarinen

Subject: Re: [PATCH] wl1271: update hw/fw version info in wiphy struct

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 <[email protected]>
> ---
> 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 <[email protected]>


-Juuso