aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/bridge_loop_avoidance.h
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-12 07:38:47 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 16:15:17 -0400
commit08adf1512298201a53b88bb0a3d67e0dbbe0ed9b (patch)
treec0300fbf9717978726becbbdf14f1332178e78cd /net/batman-adv/bridge_loop_avoidance.h
parent0f5f9322681887ca221707afafe4216b6db5d22f (diff)
batman-adv: Prefix bridge_loop_avoidance 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/bridge_loop_avoidance.h')
-rw-r--r--net/batman-adv/bridge_loop_avoidance.h67
1 files changed, 35 insertions, 32 deletions
diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h
index e39f93acc28..546cd641012 100644
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@ -23,73 +23,76 @@
23#define _NET_BATMAN_ADV_BLA_H_ 23#define _NET_BATMAN_ADV_BLA_H_
24 24
25#ifdef CONFIG_BATMAN_ADV_BLA 25#ifdef CONFIG_BATMAN_ADV_BLA
26int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid); 26int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid);
27int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid); 27int batadv_bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid);
28int bla_is_backbone_gw(struct sk_buff *skb, 28int batadv_bla_is_backbone_gw(struct sk_buff *skb,
29 struct orig_node *orig_node, int hdr_size); 29 struct orig_node *orig_node, int hdr_size);
30int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset); 30int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
31int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig); 31int batadv_bla_is_backbone_gw_orig(struct bat_priv *bat_priv, uint8_t *orig);
32int bla_check_bcast_duplist(struct bat_priv *bat_priv, 32int batadv_bla_check_bcast_duplist(struct bat_priv *bat_priv,
33 struct bcast_packet *bcast_packet, int hdr_size); 33 struct bcast_packet *bcast_packet,
34void bla_update_orig_address(struct bat_priv *bat_priv, 34 int hdr_size);
35 struct hard_iface *primary_if, 35void batadv_bla_update_orig_address(struct bat_priv *bat_priv,
36 struct hard_iface *oldif); 36 struct hard_iface *primary_if,
37int bla_init(struct bat_priv *bat_priv); 37 struct hard_iface *oldif);
38void bla_free(struct bat_priv *bat_priv); 38int batadv_bla_init(struct bat_priv *bat_priv);
39void batadv_bla_free(struct bat_priv *bat_priv);
39 40
40#define BLA_CRC_INIT 0 41#define BLA_CRC_INIT 0
41#else /* ifdef CONFIG_BATMAN_ADV_BLA */ 42#else /* ifdef CONFIG_BATMAN_ADV_BLA */
42 43
43static inline int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, 44static inline int batadv_bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb,
44 short vid) 45 short vid)
45{ 46{
46 return 0; 47 return 0;
47} 48}
48 49
49static inline int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, 50static inline int batadv_bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb,
50 short vid) 51 short vid)
51{ 52{
52 return 0; 53 return 0;
53} 54}
54 55
55static inline int bla_is_backbone_gw(struct sk_buff *skb, 56static inline int batadv_bla_is_backbone_gw(struct sk_buff *skb,
56 struct orig_node *orig_node, 57 struct orig_node *orig_node,
57 int hdr_size) 58 int hdr_size)
58{ 59{
59 return 0; 60 return 0;
60} 61}
61 62
62static inline int bla_claim_table_seq_print_text(struct seq_file *seq, 63static inline int batadv_bla_claim_table_seq_print_text(struct seq_file *seq,
63 void *offset) 64 void *offset)
64{ 65{
65 return 0; 66 return 0;
66} 67}
67 68
68static inline int bla_is_backbone_gw_orig(struct bat_priv *bat_priv, 69static inline int batadv_bla_is_backbone_gw_orig(struct bat_priv *bat_priv,
69 uint8_t *orig) 70 uint8_t *orig)
70{ 71{
71 return 0; 72 return 0;
72} 73}
73 74
74static inline int bla_check_bcast_duplist(struct bat_priv *bat_priv, 75static inline int
75 struct bcast_packet *bcast_packet, 76batadv_bla_check_bcast_duplist(struct bat_priv *bat_priv,
76 int hdr_size) 77 struct bcast_packet *bcast_packet,
78 int hdr_size)
77{ 79{
78 return 0; 80 return 0;
79} 81}
80 82
81static inline void bla_update_orig_address(struct bat_priv *bat_priv, 83static inline void
82 struct hard_iface *primary_if, 84batadv_bla_update_orig_address(struct bat_priv *bat_priv,
83 struct hard_iface *oldif) 85 struct hard_iface *primary_if,
86 struct hard_iface *oldif)
84{ 87{
85} 88}
86 89
87static inline int bla_init(struct bat_priv *bat_priv) 90static inline int batadv_bla_init(struct bat_priv *bat_priv)
88{ 91{
89 return 1; 92 return 1;
90} 93}
91 94
92static inline void bla_free(struct bat_priv *bat_priv) 95static inline void batadv_bla_free(struct bat_priv *bat_priv)
93{ 96{
94} 97}
95 98
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-15 03:22:12 -0400