Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
batman-adv: Use special names for legacy TT client flags
The client flag definitions are different in batman-adv-legacy and
incompatible to the definitions in the netlink api. Renaming them to a
*V14* specific name allows to use the upstream batman-adv netlink headers
together with batman-adv-legacy.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
  • Loading branch information
ecsv committed Nov 27, 2016
1 parent 960841a commit e86154f
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 78 deletions.
18 changes: 9 additions & 9 deletions packet.h
Expand Up @@ -84,18 +84,18 @@ enum batadv_tt_query_flags {
BATADV_TT_FULL_TABLE = BIT(2),
};

/* BATADV_TT_CLIENT flags.
/* BATADV_TT_V14_CLIENT flags.
* Flags from BIT(0) to BIT(7) are sent on the wire, while flags from BIT(8) to
* BIT(15) are used for local computation only
*/
enum batadv_tt_client_flags {
BATADV_TT_CLIENT_DEL = BIT(0),
BATADV_TT_CLIENT_ROAM = BIT(1),
BATADV_TT_CLIENT_WIFI = BIT(2),
BATADV_TT_CLIENT_TEMP = BIT(3),
BATADV_TT_CLIENT_NOPURGE = BIT(8),
BATADV_TT_CLIENT_NEW = BIT(9),
BATADV_TT_CLIENT_PENDING = BIT(10),
enum batadv_tt_v14_client_flags {
BATADV_TT_V14_CLIENT_DEL = BIT(0),
BATADV_TT_V14_CLIENT_ROAM = BIT(1),
BATADV_TT_V14_CLIENT_WIFI = BIT(2),
BATADV_TT_V14_CLIENT_TEMP = BIT(3),
BATADV_TT_V14_CLIENT_NOPURGE = BIT(8),
BATADV_TT_V14_CLIENT_NEW = BIT(9),
BATADV_TT_V14_CLIENT_PENDING = BIT(10),
};

/* claim frame types for the bridge loop avoidance */
Expand Down
2 changes: 1 addition & 1 deletion routing.c
Expand Up @@ -667,7 +667,7 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
roam_adv_packet->src, roam_adv_packet->client);

batadv_tt_global_add(bat_priv, orig_node, roam_adv_packet->client,
BATADV_TT_CLIENT_ROAM,
BATADV_TT_V14_CLIENT_ROAM,
atomic_read(&orig_node->last_ttvn) + 1);

batadv_orig_node_free_ref(orig_node);
Expand Down

0 comments on commit e86154f

Please sign in to comment.