From 5d6793669cf129bee221d507a0c59e7c92364030 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Sat, 10 Dec 2011 11:33:53 -0800 Subject: [PATCH] --- yaml --- r: 279351 b: refs/heads/master c: fb6c1c6c352260bc1c90e474f6c08de7e06f1990 h: refs/heads/master i: 279349: 40a8771fe3e7bfaad4f92c7651872d2610a694f8 279347: dff911cc471c437a5ebb98a9c38135598c4b88c7 279343: c8ce8b26e3c6fb8d726d8a763ffabbb9a71bf511 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 404d3845d74c..028a394f55a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ba958ebf1440411a052bfeedd5b80f7645b3541 +refs/heads/master: fb6c1c6c352260bc1c90e474f6c08de7e06f1990 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c b/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c index 05d301687dae..4a5cddd2d56b 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-testmode.c @@ -422,8 +422,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb) struct sk_buff *skb; unsigned char *rsp_data_ptr = NULL; int status = 0, rsp_data_len = 0; - char buf[32], *ptr = NULL; - unsigned int num, devid; + u32 devid; switch (nla_get_u32(tb[IWL_TM_ATTR_COMMAND])) { case IWL_TM_CMD_APP2DEV_GET_DEVICENAME: @@ -534,14 +533,8 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb) break; case IWL_TM_CMD_APP2DEV_GET_DEVICE_ID: - bus_get_hw_id_string(bus(priv), buf, sizeof(buf)); - ptr = buf; - strsep(&ptr, ":"); - sscanf(strsep(&ptr, ":"), "%x", &num); - sscanf(strsep(&ptr, ":"), "%x", &devid); - IWL_INFO(priv, "Device ID = 0x%04x, SubDevice ID= 0x%04x\n", - num, devid); - devid |= (num << 16); + devid = bus_get_hw_id(bus(priv)); + IWL_INFO(priv, "hw version: 0x%x\n", devid); skb = cfg80211_testmode_alloc_reply_skb(hw->wiphy, 20); if (!skb) {