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

batman at open-mesh.org batman at open-mesh.org
Wed Oct 30 00:18:02 CET 2013


The following commit has been merged in the master branch:
commit d7ee88d048542f8052fc2d3c1413ac2287d826f5
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Sun May 5 14:37:56 2013 +0200

    batman-adv: remove batadv_tt_global_add_orig declaration
    
    batadv_tt_global_add_orig is neither used nor implemented
    anymore, therefore it is possible to remove its declaration
    
    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.h b/net/batman-adv/translation-table.h
index fb710c5..015d8b9 100644
--- a/net/batman-adv/translation-table.h
+++ b/net/batman-adv/translation-table.h
@@ -27,9 +27,6 @@ uint16_t batadv_tt_local_remove(struct batadv_priv *bat_priv,
 				const uint8_t *addr, const char *message,
 				bool roaming);
 int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset);
-void batadv_tt_global_add_orig(struct batadv_priv *bat_priv,
-			       struct batadv_orig_node *orig_node,
-			       const unsigned char *tt_buff, int tt_buff_len);
 int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset);
 void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
 			       struct batadv_orig_node *orig_node,

-- 
LinuxNextTracking


More information about the linux-merge mailing list