diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-05-11 20:09:39 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-20 16:15:29 -0400 |
commit | 08c36d3e8ad1f73d3b0322842363b23f6d203630 (patch) | |
tree | 9190100a886c18956fee193acbd8fd160060bc19 /net/batman-adv/bat_iv_ogm.c | |
parent | 04b482a21aaf22cf5b327fb6a3fba6fdc8cb3de9 (diff) |
batman-adv: Prefix translation-table 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/bat_iv_ogm.c')
-rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 1566eac02d4c..62b52b663afb 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c | |||
@@ -138,7 +138,10 @@ static uint8_t hop_penalty(uint8_t tq, const struct bat_priv *bat_priv) | |||
138 | static int bat_iv_ogm_aggr_packet(int buff_pos, int packet_len, | 138 | static int bat_iv_ogm_aggr_packet(int buff_pos, int packet_len, |
139 | int tt_num_changes) | 139 | int tt_num_changes) |
140 | { | 140 | { |
141 | int next_buff_pos = buff_pos + BATMAN_OGM_HLEN + tt_len(tt_num_changes); | 141 | int next_buff_pos = 0; |
142 | |||
143 | next_buff_pos += buff_pos + BATMAN_OGM_HLEN; | ||
144 | next_buff_pos += batadv_tt_len(tt_num_changes); | ||
142 | 145 | ||
143 | return (next_buff_pos <= packet_len) && | 146 | return (next_buff_pos <= packet_len) && |
144 | (next_buff_pos <= MAX_AGGREGATION_BYTES); | 147 | (next_buff_pos <= MAX_AGGREGATION_BYTES); |
@@ -188,8 +191,8 @@ static void bat_iv_ogm_send_to_if(struct forw_packet *forw_packet, | |||
188 | batman_ogm_packet->ttvn, hard_iface->net_dev->name, | 191 | batman_ogm_packet->ttvn, hard_iface->net_dev->name, |
189 | hard_iface->net_dev->dev_addr); | 192 | hard_iface->net_dev->dev_addr); |
190 | 193 | ||
191 | buff_pos += BATMAN_OGM_HLEN + | 194 | buff_pos += BATMAN_OGM_HLEN; |
192 | tt_len(batman_ogm_packet->tt_num_changes); | 195 | buff_pos += batadv_tt_len(batman_ogm_packet->tt_num_changes); |
193 | packet_num++; | 196 | packet_num++; |
194 | batman_ogm_packet = (struct batman_ogm_packet *) | 197 | batman_ogm_packet = (struct batman_ogm_packet *) |
195 | (forw_packet->skb->data + buff_pos); | 198 | (forw_packet->skb->data + buff_pos); |
@@ -556,7 +559,7 @@ static void bat_iv_ogm_forward(struct orig_node *orig_node, | |||
556 | batman_ogm_packet->flags &= ~DIRECTLINK; | 559 | batman_ogm_packet->flags &= ~DIRECTLINK; |
557 | 560 | ||
558 | bat_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet, | 561 | bat_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet, |
559 | BATMAN_OGM_HLEN + tt_len(tt_num_changes), | 562 | BATMAN_OGM_HLEN + batadv_tt_len(tt_num_changes), |
560 | if_incoming, 0, bat_iv_ogm_fwd_send_time()); | 563 | if_incoming, 0, bat_iv_ogm_fwd_send_time()); |
561 | } | 564 | } |
562 | 565 | ||
@@ -724,10 +727,10 @@ update_tt: | |||
724 | if (((batman_ogm_packet->orig != ethhdr->h_source) && | 727 | if (((batman_ogm_packet->orig != ethhdr->h_source) && |
725 | (batman_ogm_packet->header.ttl > 2)) || | 728 | (batman_ogm_packet->header.ttl > 2)) || |
726 | (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP)) | 729 | (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP)) |
727 | tt_update_orig(bat_priv, orig_node, tt_buff, | 730 | batadv_tt_update_orig(bat_priv, orig_node, tt_buff, |
728 | batman_ogm_packet->tt_num_changes, | 731 | batman_ogm_packet->tt_num_changes, |
729 | batman_ogm_packet->ttvn, | 732 | batman_ogm_packet->ttvn, |
730 | ntohs(batman_ogm_packet->tt_crc)); | 733 | ntohs(batman_ogm_packet->tt_crc)); |
731 | 734 | ||
732 | if (orig_node->gw_flags != batman_ogm_packet->gw_flags) | 735 | if (orig_node->gw_flags != batman_ogm_packet->gw_flags) |
733 | batadv_gw_node_update(bat_priv, orig_node, | 736 | batadv_gw_node_update(bat_priv, orig_node, |
@@ -1229,8 +1232,8 @@ static int bat_iv_ogm_receive(struct sk_buff *skb, | |||
1229 | bat_iv_ogm_process(ethhdr, batman_ogm_packet, | 1232 | bat_iv_ogm_process(ethhdr, batman_ogm_packet, |
1230 | tt_buff, if_incoming); | 1233 | tt_buff, if_incoming); |
1231 | 1234 | ||
1232 | buff_pos += BATMAN_OGM_HLEN + | 1235 | buff_pos += BATMAN_OGM_HLEN; |
1233 | tt_len(batman_ogm_packet->tt_num_changes); | 1236 | buff_pos += batadv_tt_len(batman_ogm_packet->tt_num_changes); |
1234 | 1237 | ||
1235 | batman_ogm_packet = (struct batman_ogm_packet *) | 1238 | batman_ogm_packet = (struct batman_ogm_packet *) |
1236 | (packet_buff + buff_pos); | 1239 | (packet_buff + buff_pos); |