[backfire/packages] batman-adv: merge r28474

SVN-Revision: 28477

diff --git a/net/batman-adv/patches/batman-adv_correctly_set_the_data_field_in_the_TT_REPONSE_packet.patch b/net/batman-adv/patches/batman-adv_correctly_set_the_data_field_in_the_TT_REPONSE_packet.patch
new file mode 100644 (file)
index 0000000..f83bab5
--- /dev/null
+++ b/net/batman-adv/patches/batman-adv_correctly_set_the_data_field_in_the_TT_REPONSE_packet.patch
@@ -0,0 +1,36 @@
+From: Antonio Quartulli <ordex@autistici.org>
+
+In the TT_RESPONSE packet, the number of carried entries is not correctly set.
+This leads to a wrong interpretation of the packet payload on the receiver side
+causing random entries to be added to the global translation table. Therefore
+the latter gets always corrupted, triggering a table recovery all the time.
+
+Signed-off-by: Antonio Quartulli <ordex@autistici.org>
+---
+ translation-table.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+--- a/translation-table.c
++++ b/translation-table.c
+@@ -1054,7 +1054,6 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
+       tt_response = (struct tt_query_packet *)skb_put(skb,
+                                                    tt_query_size + tt_len);
+       tt_response->ttvn = ttvn;
+-      tt_response->tt_data = htons(tt_tot);
+ 
+       tt_change = (struct tt_change *)(skb->data + tt_query_size);
+       tt_count = 0;
+@@ -1080,6 +1079,10 @@ static struct sk_buff *tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
+       }
+       rcu_read_unlock();
+ 
++      /* store in the message the number of entries we have successfully
++       * copied */
++      tt_response->tt_data = htons(tt_count);
++
+ out:
+       return skb;
+ }
+-- 
+1.7.3.4
+

diff --git a/net/batman-adv/patches/batman-adv_fix_tt_local_reset_flags_function.patch b/net/batman-adv/patches/batman-adv_fix_tt_local_reset_flags_function.patch
index 3d0d51e15b9617fd43df75dcec9b940d27a4a3de..1a59bc8b3ff1bd155cf66cee329cfd051fe33563 100644 (file)
--- a/net/batman-adv/patches/batman-adv_fix_tt_local_reset_flags_function.patch
+++ b/net/batman-adv/patches/batman-adv_fix_tt_local_reset_flags_function.patch
@@ -13,8 +13,6 @@ Acked-by: Junkeun Song <jun361@gmail.com>
  translation-table.c |    2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/translation-table.c b/translation-table.c
-index 2d2cfc1..d4a3917 100644
 --- a/translation-table.c
 +++ b/translation-table.c
 @@ -1727,6 +1727,8 @@ static void tt_local_reset_flags(struct bat_priv *bat_priv, uint16_t flags)