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

batman at open-mesh.org batman at open-mesh.org
Tue Jan 13 00:24:17 CET 2015

The following commit has been merged in the master branch:
commit 320b936678f57107524063e4fe3c29d1d4795810
Author: Simon Wunderlich <sw at simonwunderlich.de>
Date:   Wed Jul 16 12:23:10 2014 +0200

    batman-adv: remove obsolete variable primary_iface from orig_node
    This variable became obsolete when changing to the new bonding mechanism
    based on the multi interface optimization. Since its not used anywhere,
    remove it.
    Reported-by: Linus Lüssing <linus.luessing at web.de>
    Signed-off-by: Simon Wunderlich <sw at simonwunderlich.de>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <antonio at meshcoding.com>

diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 8854c05..462a70c 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -199,7 +199,6 @@ struct batadv_orig_bat_iv {
  * struct batadv_orig_node - structure for orig_list maintaining nodes of mesh
  * @orig: originator ethernet address
- * @primary_addr: hosts primary interface address
  * @ifinfo_list: list for routers per outgoing interface
  * @last_bonding_candidate: pointer to last ifinfo of last used router
  * @batadv_dat_addr_t:  address of the orig node in the distributed hash
@@ -244,7 +243,6 @@ struct batadv_orig_bat_iv {
 struct batadv_orig_node {
 	uint8_t orig[ETH_ALEN];
-	uint8_t primary_addr[ETH_ALEN];
 	struct hlist_head ifinfo_list;
 	struct batadv_orig_ifinfo *last_bonding_candidate;


More information about the linux-merge mailing list