batman-adv/patches/0003-batman-adv-fix-variable-name-in-compat-code.patch

   1 From e39bc52671fb33e7d79e58cd5838be75e12abeb8 Mon Sep 17 00:00:00 2001
   2 From: Antonio Quartulli <ordex@autistici.org>
   3 Date: Sun, 18 Aug 2013 12:40:03 +0200
   4 Subject: [PATCH 3/4] batman-adv: fix variable name in compat code
   5
   6 compat code introduced by
   7 0d941e82ab5f92faf33bee6abdde519056f3ac2d
   8 ("batman-adv: Unmap fragment page once iterator is done")
   9 is declaring a variable having the same name of one used in
  10 the batman-adv code. Rename it to prevent sparse warnings.
  11
  12 Signed-off-by: Antonio Quartulli <ordex@autistici.org>
  13 Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
  14 ---
  15  compat.h | 6 +++---
  16  1 file changed, 3 insertions(+), 3 deletions(-)
  17
  18 diff --git a/compat.h b/compat.h
  19 index 346a824..35ed4d9 100644
  20 --- a/compat.h
  21 +++ b/compat.h
  22 @@ -309,10 +309,10 @@ static int __batadv_interface_set_mac_addr(x, y)
  23  /* older kernels still need to call skb_abort_seq_read() */
  24  #define skb_seq_read(consumed, data, st) \
  25         ({ \
  26 -               int len = skb_seq_read(consumed, data, st); \
  27 -               if (len == 0) \
  28 +               int __len = skb_seq_read(consumed, data, st); \
  29 +               if (__len == 0) \
  30                         skb_abort_seq_read(st); \
  31 -               len; \
  32 +               __len; \
  33         })
  34  #endif /* < KERNEL_VERSION(3, 11, 0) */
  35
  36 --
  37 1.8.4.rc3
  38