Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6572e91d5fa61bb3f879a00b96d763c566ced6cb

Authored by Rajkumar Manoharan
Committed by John W. Linville
1 parent d21844c7c2
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

wireless: Fix warnings due to -Wunused-but-set-variable 

These warnings are exposed by gcc 4.6.
net/wireless/reg.c: In function 'freq_reg_info_regd':
net/wireless/reg.c:675:38: warning: variable 'pr' set but not used
[-Wunused-but-set-variable]
net/wireless/lib80211_crypt_wep.c: In function 'lib80211_wep_build_iv':
net/wireless/lib80211_crypt_wep.c:99:12: warning: variable 'len' set but
not used [-Wunused-but-set-variable]

Signed-off-by: Rajkumar Manoharan <rmanoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 2 changed files with 1 additions and 4 deletions Side-by-side Diff

net/wireless/lib80211_crypt_wep.c
Diff comments   View file @ 6572e91
... ... @@ -96,13 +96,12 @@
96 96 u8 *key, int keylen, void *priv)
97 97 {
98 98 struct lib80211_wep_data *wep = priv;
99   - u32 klen, len;
  99 + u32 klen;
100 100 u8 *pos;
101 101  
102 102 if (skb_headroom(skb) < 4 || skb->len < hdr_len)
103 103 return -1;
104 104  
105   - len = skb->len - hdr_len;
106 105 pos = skb_push(skb, 4);
107 106 memmove(pos, pos + 4, hdr_len);
108 107 pos += hdr_len;
... ... @@ -672,11 +672,9 @@
672 672 for (i = 0; i < regd->n_reg_rules; i++) {
673 673 const struct ieee80211_reg_rule *rr;
674 674 const struct ieee80211_freq_range *fr = NULL;
675   - const struct ieee80211_power_rule *pr = NULL;
676 675  
677 676 rr = &regd->reg_rules[i];
678 677 fr = &rr->freq_range;
679   - pr = &rr->power_rule;
680 678  
681 679 /*
682 680 * We only need to know if one frequency rule was