From: Simon Wunderlich Date: Wed, 16 Jul 2014 10:23:10 +0000 (+0200) Subject: batman-adv: remove obsolete variable primary_iface from orig_node X-Git-Tag: android-x86-4.4-r3~374^2~266^2~13 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=320b936678f57107524063e4fe3c29d1d4795810;p=android-x86%2Fkernel.git 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 Signed-off-by: Simon Wunderlich Signed-off-by: Marek Lindner Signed-off-by: Antonio Quartulli --- diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 8854c05622a9..462a70c0db8f 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; #ifdef CONFIG_BATMAN_ADV_DAT