diff options
author | Sven Eckelmann <sven@narfation.org> | 2012-06-05 16:31:30 -0400 |
---|---|---|
committer | Antonio Quartulli <ordex@autistici.org> | 2012-07-01 16:47:21 -0400 |
commit | 96412690116afcc1b2705615b5a7c8dc6c5e905f (patch) | |
tree | 0eb2a1a557e2997175b27f3ab925bbdc29ece54d /net/batman-adv/unicast.h | |
parent | b4d66b877bc21ce907938bfd027dfe016617fac0 (diff) |
batman-adv: Prefix packet structs with batadv_
Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Diffstat (limited to 'net/batman-adv/unicast.h')
-rw-r--r-- | net/batman-adv/unicast.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/unicast.h b/net/batman-adv/unicast.h index 510e23f4179d..e0b6e335797e 100644 --- a/net/batman-adv/unicast.h +++ b/net/batman-adv/unicast.h | |||
@@ -35,11 +35,11 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv, | |||
35 | 35 | ||
36 | static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu) | 36 | static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu) |
37 | { | 37 | { |
38 | const struct unicast_frag_packet *unicast_packet; | 38 | const struct batadv_unicast_frag_packet *unicast_packet; |
39 | int uneven_correction = 0; | 39 | int uneven_correction = 0; |
40 | unsigned int merged_size; | 40 | unsigned int merged_size; |
41 | 41 | ||
42 | unicast_packet = (struct unicast_frag_packet *)skb->data; | 42 | unicast_packet = (struct batadv_unicast_frag_packet *)skb->data; |
43 | 43 | ||
44 | if (unicast_packet->flags & BATADV_UNI_FRAG_LARGETAIL) { | 44 | if (unicast_packet->flags & BATADV_UNI_FRAG_LARGETAIL) { |
45 | if (unicast_packet->flags & BATADV_UNI_FRAG_HEAD) | 45 | if (unicast_packet->flags & BATADV_UNI_FRAG_HEAD) |
@@ -49,7 +49,7 @@ static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu) | |||
49 | } | 49 | } |
50 | 50 | ||
51 | merged_size = (skb->len - sizeof(*unicast_packet)) * 2; | 51 | merged_size = (skb->len - sizeof(*unicast_packet)) * 2; |
52 | merged_size += sizeof(struct unicast_packet) + uneven_correction; | 52 | merged_size += sizeof(struct batadv_unicast_packet) + uneven_correction; |
53 | 53 | ||
54 | return merged_size <= mtu; | 54 | return merged_size <= mtu; |
55 | } | 55 | } |