* [B.A.T.M.A.N.] [PATCH maint] batman-adv: fix variable name in compat code
@ 2013-08-18 10:40 Antonio Quartulli
2013-08-18 14:06 ` Marek Lindner
0 siblings, 1 reply; 2+ messages in thread
From: Antonio Quartulli @ 2013-08-18 10:40 UTC (permalink / raw)
To: b.a.t.m.a.n; +Cc: Antonio Quartulli
compat code introduced by
0d941e82ab5f92faf33bee6abdde519056f3ac2d
("batman-adv: Unmap fragment page once iterator is done")
is declaring a variable having the same name of one used in
the batman-adv code. Rename it to prevent sparse warnings.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
compat.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/compat.h b/compat.h
index 346a824..35ed4d9 100644
--- a/compat.h
+++ b/compat.h
@@ -309,10 +309,10 @@ static int __batadv_interface_set_mac_addr(x, y)
/* older kernels still need to call skb_abort_seq_read() */
#define skb_seq_read(consumed, data, st) \
({ \
- int len = skb_seq_read(consumed, data, st); \
- if (len == 0) \
+ int __len = skb_seq_read(consumed, data, st); \
+ if (__len == 0) \
skb_abort_seq_read(st); \
- len; \
+ __len; \
})
#endif /* < KERNEL_VERSION(3, 11, 0) */
--
1.8.1.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [B.A.T.M.A.N.] [PATCH maint] batman-adv: fix variable name in compat code
2013-08-18 10:40 [B.A.T.M.A.N.] [PATCH maint] batman-adv: fix variable name in compat code Antonio Quartulli
@ 2013-08-18 14:06 ` Marek Lindner
0 siblings, 0 replies; 2+ messages in thread
From: Marek Lindner @ 2013-08-18 14:06 UTC (permalink / raw)
To: The list for a Better Approach To Mobile Ad-hoc Networking
Cc: Antonio Quartulli
On Sunday, August 18, 2013 18:40:03 Antonio Quartulli wrote:
> compat code introduced by
> 0d941e82ab5f92faf33bee6abdde519056f3ac2d
> ("batman-adv: Unmap fragment page once iterator is done")
> is declaring a variable having the same name of one used in
> the batman-adv code. Rename it to prevent sparse warnings.
>
> Signed-off-by: Antonio Quartulli <ordex@autistici.org>
> ---
> compat.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Applied in revision e39bc52.
Thanks,
Marek
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-18 14:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-18 10:40 [B.A.T.M.A.N.] [PATCH maint] batman-adv: fix variable name in compat code Antonio Quartulli
2013-08-18 14:06 ` Marek Lindner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox