Commit
d788d8056fd913defa48bd94f18dc53de98cd7a6
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
[TIPC]: Fix two minor sparse warnings.
fix two warnings generated by sparse:
link.c:2386 symbol 'msgcount' shadows an earlier one
node.c:244 symbol 'addr_string' shadows an earlier one
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Showing
2 changed files
with
1 additions
and
3 deletions
Side-by-side Diff
... |
... |
@@ -2383,10 +2383,10 @@ |
2383
|
2383 |
struct tipc_msg *msg = buf_msg(crs); |
2384
|
2384 |
|
2385
|
2385 |
if ((msg_user(msg) == MSG_BUNDLER) && split_bundles) { |
2386
|
|
- u32 msgcount = msg_msgcnt(msg); |
2387
|
2386 |
struct tipc_msg *m = msg_get_wrapped(msg); |
2388
|
2387 |
unchar* pos = (unchar*)m; |
2389
|
2388 |
|
|
2389 |
+ msgcount = msg_msgcnt(msg); |
2390
|
2390 |
while (msgcount--) { |
2391
|
2391 |
msg_set_seqno(m,msg_seqno(msg)); |
2392
|
2392 |
tipc_link_tunnel(l_ptr, &tunnel_hdr, m, |
... |
... |
@@ -241,8 +241,6 @@ |
241
|
241 |
char addr_string[16]; |
242
|
242 |
|
243
|
243 |
if (n_ptr->link_cnt >= 2) { |
244
|
|
- char addr_string[16]; |
245
|
|
- |
246
|
244 |
err("Attempt to create third link to %s\n", |
247
|
245 |
addr_string_fill(addr_string, n_ptr->addr)); |
248
|
246 |
return NULL; |