From d007095eb488e11cac54e740f6250ace44656c29 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Wed, 28 Jul 2010 16:59:41 -0400 Subject: [PATCH] --- yaml --- r: 203937 b: refs/heads/master c: 8b28e82224321d6fdabadd7d6ddc4bd28a3b5490 h: refs/heads/master i: 203935: 1f05233506c4f60763dc1530bfbfa21de9c7a9d8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1251_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a2e64888f17c..d4ad62b32a2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ece550d0e416b4146e1ec3d934f9773dbf8c7242 +refs/heads/master: 8b28e82224321d6fdabadd7d6ddc4bd28a3b5490 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c index a6d8d1ad5dc0..861a5f33761e 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c @@ -411,6 +411,7 @@ static int wl1251_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) static int wl1251_op_start(struct ieee80211_hw *hw) { struct wl1251 *wl = hw->priv; + struct wiphy *wiphy = hw->wiphy; int ret = 0; wl1251_debug(DEBUG_MAC80211, "mac80211 start"); @@ -444,6 +445,10 @@ static int wl1251_op_start(struct ieee80211_hw *hw) wl1251_info("firmware booted (%s)", wl->fw_ver); + /* update hw/fw version info in wiphy struct */ + wiphy->hw_version = wl->chip_id; + strncpy(wiphy->fw_version, wl->fw_ver, sizeof(wiphy->fw_version)); + out: if (ret < 0) wl1251_power_off(wl);