diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-05-12 13:48:57 +0200 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-06-24 18:41:42 +0200 |
| commit | f0530ee5fb9e73465ac844ada2c96a2bea85a18f (patch) | |
| tree | 4f9dec257b99fac7a0cb9de8841b970858dc1391 /net/batman-adv | |
| parent | da641193dd3117ccd408dc589a131f16286b0da0 (diff) | |
| download | blackbird-op-linux-f0530ee5fb9e73465ac844ada2c96a2bea85a18f.tar.gz blackbird-op-linux-f0530ee5fb9e73465ac844ada2c96a2bea85a18f.zip | |
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: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv')
| -rw-r--r-- | net/batman-adv/routing.c | 3 | ||||
| -rw-r--r-- | net/batman-adv/unicast.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 0888f1e39fdc..3eb4a2e121a6 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -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 && - 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); diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h index 87f8f89d1440..9257b83534fd 100644 --- a/net/batman-adv/unicast.h +++ b/net/batman-adv/unicast.h @@ -33,7 +33,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, struct hard_iface *hard_iface, 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; int uneven_correction = 0; |
