From 2e572402affca027169b3fb19f07f714a602fd92 Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 12 May 2012 13:48:57 +0200 Subject: [PATCH] --- yaml --- r: 314588 b: refs/heads/master c: f0530ee5fb9e73465ac844ada2c96a2bea85a18f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/batman-adv/routing.c | 3 ++- trunk/net/batman-adv/unicast.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b93ff9795520..8b8e70c93ee2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da641193dd3117ccd408dc589a131f16286b0da0 +refs/heads/master: f0530ee5fb9e73465ac844ada2c96a2bea85a18f diff --git a/trunk/net/batman-adv/routing.c b/trunk/net/batman-adv/routing.c index 0888f1e39fdc..3eb4a2e121a6 100644 --- a/trunk/net/batman-adv/routing.c +++ b/trunk/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/trunk/net/batman-adv/unicast.h b/trunk/net/batman-adv/unicast.h index 87f8f89d1440..9257b83534fd 100644 --- a/trunk/net/batman-adv/unicast.h +++ b/trunk/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;