Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0530ee5 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix unicast static inline functions with batadv_ 



All non-static symbols of batman-adv were prefixed with batadv_ to avoid
collisions with other symbols of the kernel. Other symbols of batman-adv
should use the same prefix to keep the naming scheme consistent.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent da641193

net/batman-adv/routing.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -869,7 +869,8 @@ static int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) 
	}

	}





	if (unicast_packet->header.packet_type == BAT_UNICAST_FRAG &&

	if (unicast_packet->header.packet_type == BAT_UNICAST_FRAG &&

	    frag_can_reassemble(skb, neigh_node->if_incoming->net_dev->mtu)) {

	    batadv_frag_can_reassemble(skb,

				       neigh_node->if_incoming->net_dev->mtu)) {





		ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);

		ret = batadv_frag_reassemble_skb(skb, bat_priv, &new_skb);

net/batman-adv/unicast.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, 
			 struct hard_iface *hard_iface,

			 struct hard_iface *hard_iface,

			 const uint8_t dstaddr[]);

			 const uint8_t dstaddr[]);





static inline int frag_can_reassemble(const struct sk_buff *skb, int mtu)

static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu)

{

{

	const struct unicast_frag_packet *unicast_packet;

	const struct unicast_frag_packet *unicast_packet;

	int uneven_correction = 0;

	int uneven_correction = 0;