[linux-next] LinuxNextTracking branch, master, updated. next-20121126

batman at open-mesh.org batman at open-mesh.org
Tue Nov 27 00:21:17 CET 2012


The following commit has been merged in the master branch:
commit 27b37ebfa2d2a1b6acef6f2d21c497475c9b9709
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Thu Nov 8 14:21:11 2012 +0100

    batman-adv: correctly pass the client flag on tt_response
    
    When a TT response with the full table is sent, the client flags
    should be sent as well. This patch fix the flags assignment when
    populating the tt_response to send back
    
    This was introduced by 30cfd02b60e1cb16f5effb0a01f826c5bb7e4c59
    ("batman-adv: detect not yet announced clients")
    
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 64c0012..fec1a00 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -1502,7 +1502,7 @@ batadv_tt_response_fill_table(uint16_t tt_len, uint8_t ttvn,
 
 			memcpy(tt_change->addr, tt_common_entry->addr,
 			       ETH_ALEN);
-			tt_change->flags = BATADV_NO_FLAGS;
+			tt_change->flags = tt_common_entry->flags;
 
 			tt_count++;
 			tt_change++;

-- 
LinuxNextTracking


More information about the linux-merge mailing list