batman-adv: remove leftovers of unused BATADV_PRIMARIES_FIRST_HOP flag

Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <a@unstable.cc>

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 5677169c1b98a235974f3eb7a0d0afe71e49ca08..246702486228fd3e964babcf407c7cc100f0d415 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -361,7 +361,6 @@ batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface)
        unsigned char *ogm_buff = hard_iface->bat_iv.ogm_buff;
 
        batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff;
-       batadv_ogm_packet->flags = BATADV_PRIMARIES_FIRST_HOP;
        batadv_ogm_packet->ttl = BATADV_TTL;
 }
 
@@ -842,8 +841,6 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node,
                   "Forwarding packet: tq: %i, ttl: %i\n",
                   batadv_ogm_packet->tq, batadv_ogm_packet->ttl);
 
-       /* switch of primaries first hop flag when forwarding */
-       batadv_ogm_packet->flags &= ~BATADV_PRIMARIES_FIRST_HOP;
        if (is_single_hop_neigh)
                batadv_ogm_packet->flags |= BATADV_DIRECTLINK;
        else

diff --git a/net/batman-adv/packet.h b/net/batman-adv/packet.h
index 11f996b39fefade55de2dbefdc833e633ba76064..0558e3237e0e7e38a42ff7cfc7f266dc90f69709 100644 (file)
--- a/net/batman-adv/packet.h
+++ b/net/batman-adv/packet.h
@@ -72,8 +72,7 @@ enum batadv_subtype {
  * enum batadv_iv_flags - flags used in B.A.T.M.A.N. IV OGM packets
  * @BATADV_NOT_BEST_NEXT_HOP: flag is set when ogm packet is forwarded and was
  *     previously received from someone else than the best neighbor.
- * @BATADV_PRIMARIES_FIRST_HOP: flag is set when the primary interface address
- *     is used, and the packet travels its first hop.
+ * @BATADV_PRIMARIES_FIRST_HOP: flag unused.
  * @BATADV_DIRECTLINK: flag is for the first hop or if rebroadcasted from a
  *     one hop neighbor on the interface where it was originally received.
  */