batman-adv: Prefix soft-interface 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>
This commit is contained in:

committed by
Antonio Quartulli

parent
9455e34cb2
commit
04b482a21a
@@ -982,7 +982,8 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
|
||||
|
||||
/* packet for me */
|
||||
if (is_my_mac(unicast_packet->dest)) {
|
||||
interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size);
|
||||
batadv_interface_rx(recv_if->soft_iface, skb, recv_if,
|
||||
hdr_size);
|
||||
return NET_RX_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -1018,8 +1019,8 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
|
||||
if (!new_skb)
|
||||
return NET_RX_SUCCESS;
|
||||
|
||||
interface_rx(recv_if->soft_iface, new_skb, recv_if,
|
||||
sizeof(struct unicast_packet));
|
||||
batadv_interface_rx(recv_if->soft_iface, new_skb, recv_if,
|
||||
sizeof(struct unicast_packet));
|
||||
return NET_RX_SUCCESS;
|
||||
}
|
||||
|
||||
@@ -1104,7 +1105,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
|
||||
goto out;
|
||||
|
||||
/* broadcast for me */
|
||||
interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size);
|
||||
batadv_interface_rx(recv_if->soft_iface, skb, recv_if, hdr_size);
|
||||
ret = NET_RX_SUCCESS;
|
||||
goto out;
|
||||
|
||||
|
Reference in New Issue
Block a user