diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-05-11 20:09:36 -0400 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 16:15:25 -0400 |
| commit | 30d3c5113f9a3f162d65d01b771b122afac0ce79 (patch) | |
| tree | da443b3ff6ddcc0b9ffadd0b0626ac48cb1e8325 /net/batman-adv/routing.h | |
| parent | 925a6672fae532ba178b8d35686705b417aada3d (diff) | |
batman-adv: Prefix routing non-static functions with batadv_
batman-adv can be compiled as part of the kernel instead of an module. In that
case the linker will see all non-static symbols of batman-adv and all other
non-static symbols of the kernel. This could lead to symbol collisions. A
prefix for the batman-adv symbols that defines their private namespace avoids
such a problem.
Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/routing.h')
| -rw-r--r-- | net/batman-adv/routing.h | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/net/batman-adv/routing.h b/net/batman-adv/routing.h index d6bbbebb6567..4652f0c147f5 100644 --- a/net/batman-adv/routing.h +++ b/net/batman-adv/routing.h | |||
| @@ -22,30 +22,32 @@ | |||
| 22 | #ifndef _NET_BATMAN_ADV_ROUTING_H_ | 22 | #ifndef _NET_BATMAN_ADV_ROUTING_H_ |
| 23 | #define _NET_BATMAN_ADV_ROUTING_H_ | 23 | #define _NET_BATMAN_ADV_ROUTING_H_ |
| 24 | 24 | ||
| 25 | void slide_own_bcast_window(struct hard_iface *hard_iface); | 25 | void batadv_slide_own_bcast_window(struct hard_iface *hard_iface); |
| 26 | bool check_management_packet(struct sk_buff *skb, | 26 | bool batadv_check_management_packet(struct sk_buff *skb, |
| 27 | struct hard_iface *hard_iface, | 27 | struct hard_iface *hard_iface, |
| 28 | int header_len); | 28 | int header_len); |
| 29 | void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node, | 29 | void batadv_update_route(struct bat_priv *bat_priv, struct orig_node *orig_node, |
| 30 | struct neigh_node *neigh_node); | 30 | struct neigh_node *neigh_node); |
| 31 | int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if); | 31 | int batadv_recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if); |
| 32 | int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); | 32 | int batadv_recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); |
| 33 | int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if); | 33 | int batadv_recv_ucast_frag_packet(struct sk_buff *skb, |
| 34 | int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if); | 34 | struct hard_iface *recv_if); |
| 35 | int recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if); | 35 | int batadv_recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if); |
| 36 | int recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if); | 36 | int batadv_recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if); |
| 37 | int recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if); | 37 | int batadv_recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if); |
| 38 | struct neigh_node *find_router(struct bat_priv *bat_priv, | 38 | int batadv_recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if); |
| 39 | struct orig_node *orig_node, | 39 | struct neigh_node *batadv_find_router(struct bat_priv *bat_priv, |
| 40 | const struct hard_iface *recv_if); | 40 | struct orig_node *orig_node, |
| 41 | void bonding_candidate_del(struct orig_node *orig_node, | 41 | const struct hard_iface *recv_if); |
| 42 | struct neigh_node *neigh_node); | 42 | void batadv_bonding_candidate_del(struct orig_node *orig_node, |
| 43 | void bonding_candidate_add(struct orig_node *orig_node, | 43 | struct neigh_node *neigh_node); |
| 44 | struct neigh_node *neigh_node); | 44 | void batadv_bonding_candidate_add(struct orig_node *orig_node, |
| 45 | void bonding_save_primary(const struct orig_node *orig_node, | 45 | struct neigh_node *neigh_node); |
| 46 | struct orig_node *orig_neigh_node, | 46 | void batadv_bonding_save_primary(const struct orig_node *orig_node, |
| 47 | const struct batman_ogm_packet *batman_ogm_packet); | 47 | struct orig_node *orig_neigh_node, |
| 48 | int window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, | 48 | const struct batman_ogm_packet |
| 49 | unsigned long *last_reset); | 49 | *batman_ogm_packet); |
| 50 | int batadv_window_protected(struct bat_priv *bat_priv, int32_t seq_num_diff, | ||
| 51 | unsigned long *last_reset); | ||
| 50 | 52 | ||
| 51 | #endif /* _NET_BATMAN_ADV_ROUTING_H_ */ | 53 | #endif /* _NET_BATMAN_ADV_ROUTING_H_ */ |