From 75042a307386ea726b3b1d0f9ed065f672de22e5 Mon Sep 17 00:00:00 2001 From: Xianjun Jiao Date: Fri, 6 Mar 2020 14:05:47 +0100 Subject: [PATCH] fix the tsf warning in sdr.c and sdrctl --- driver/sdr.c | 6 +++--- user_space/sdrctl_src/cmd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/driver/sdr.c b/driver/sdr.c index 67dff1c..6fd2cd7 100644 --- a/driver/sdr.c +++ b/driver/sdr.c @@ -1346,7 +1346,7 @@ static int openwifi_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif * struct nlattr *tb[OPENWIFI_ATTR_MAX + 1]; struct sk_buff *skb; int err; - u32 tmp=-1, reg_cat, reg_addr, reg_val, reg_addr_idx; + u32 tmp=-1, reg_cat, reg_addr, reg_val, reg_addr_idx, tsft_high, tsft_low; err = nla_parse(tb, OPENWIFI_ATTR_MAX, data, len, openwifi_testmode_policy, NULL); if (err) @@ -1520,8 +1520,8 @@ static int openwifi_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif * if ( (!tb[OPENWIFI_ATTR_HIGH_TSF]) || (!tb[OPENWIFI_ATTR_LOW_TSF]) ) return -EINVAL; printk("openwifi_set_tsf_2"); - u32 tsft_high = nla_get_u32(tb[OPENWIFI_ATTR_HIGH_TSF]); - u32 tsft_low = nla_get_u32(tb[OPENWIFI_ATTR_LOW_TSF]); + tsft_high = nla_get_u32(tb[OPENWIFI_ATTR_HIGH_TSF]); + tsft_low = nla_get_u32(tb[OPENWIFI_ATTR_LOW_TSF]); xpu_api->XPU_REG_TSF_LOAD_VAL_write(tsft_high,tsft_low); printk("%s openwifi_set_tsf: %08x%08x\n", sdr_compatible_str,tsft_high,tsft_low); return 0; diff --git a/user_space/sdrctl_src/cmd.c b/user_space/sdrctl_src/cmd.c index a4024cf..287e42c 100644 --- a/user_space/sdrctl_src/cmd.c +++ b/user_space/sdrctl_src/cmd.c @@ -224,7 +224,7 @@ static int handle_set_tsf(struct nl80211_state *state, { struct nlattr *tmdata; char *end; - unsigned int reg_cat, high_tsf, low_tsf; + unsigned int high_tsf, low_tsf; tmdata = nla_nest_start(msg, NL80211_ATTR_TESTDATA); if (!tmdata) {