aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/send.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2012-05-11 20:09:42 -0400
committerAntonio Quartulli <ordex@autistici.org>2012-06-20 16:15:32 -0400
commit3193e8fdfa355289892661d206d1954114a7be95 (patch)
tree4fce7c85cd572389433a128db0ed180a3928e968 /net/batman-adv/send.c
parentd0f714f472967577067853acc8dabe0abc75ae8f (diff)
batman-adv: Prefix main 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/send.c')
-rw-r--r--net/batman-adv/send.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
index 8226b1cf05eb..1a0f7c364ea0 100644
--- a/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@ -121,7 +121,7 @@ static void _add_bcast_packet_to_list(struct bat_priv *bat_priv,
121 /* start timer for this packet */ 121 /* start timer for this packet */
122 INIT_DELAYED_WORK(&forw_packet->delayed_work, 122 INIT_DELAYED_WORK(&forw_packet->delayed_work,
123 send_outstanding_bcast_packet); 123 send_outstanding_bcast_packet);
124 queue_delayed_work(bat_event_workqueue, &forw_packet->delayed_work, 124 queue_delayed_work(batadv_event_workqueue, &forw_packet->delayed_work,
125 send_time); 125 send_time);
126} 126}
127 127
@@ -205,7 +205,7 @@ static void send_outstanding_bcast_packet(struct work_struct *work)
205 205
206 /* rebroadcast packet */ 206 /* rebroadcast packet */
207 rcu_read_lock(); 207 rcu_read_lock();
208 list_for_each_entry_rcu(hard_iface, &hardif_list, list) { 208 list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
209 if (hard_iface->soft_iface != soft_iface) 209 if (hard_iface->soft_iface != soft_iface)
210 continue; 210 continue;
211 211
@@ -213,7 +213,7 @@ static void send_outstanding_bcast_packet(struct work_struct *work)
213 skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC); 213 skb1 = skb_clone(forw_packet->skb, GFP_ATOMIC);
214 if (skb1) 214 if (skb1)
215 batadv_send_skb_packet(skb1, hard_iface, 215 batadv_send_skb_packet(skb1, hard_iface,
216 broadcast_addr); 216 batadv_broadcast_addr);
217 } 217 }
218 rcu_read_unlock(); 218 rcu_read_unlock();
219 219