diff options
| author | Sven Eckelmann <sven@narfation.org> | 2012-06-06 00:31:30 +0400 |
|---|---|---|
| committer | Antonio Quartulli <ordex@autistici.org> | 2012-07-02 00:47:21 +0400 |
| commit | 96412690116afcc1b2705615b5a7c8dc6c5e905f (patch) | |
| tree | 0eb2a1a557e2997175b27f3ab925bbdc29ece54d /net/batman-adv/unicast.h | |
| parent | b4d66b877bc21ce907938bfd027dfe016617fac0 (diff) | |
| download | linux-96412690116afcc1b2705615b5a7c8dc6c5e905f.tar.xz | |
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, static inline int batadv_frag_can_reassemble(const struct sk_buff *skb, int mtu) { - const struct unicast_frag_packet *unicast_packet; + const struct batadv_unicast_frag_packet *unicast_packet; int uneven_correction = 0; unsigned int merged_size; - unicast_packet = (struct unicast_frag_packet *)skb->data; + unicast_packet = (struct batadv_unicast_frag_packet *)skb->data; if (unicast_packet->flags & BATADV_UNI_FRAG_LARGETAIL) { 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) } merged_size = (skb->len - sizeof(*unicast_packet)) * 2; - merged_size += sizeof(struct unicast_packet) + uneven_correction; + merged_size += sizeof(struct batadv_unicast_packet) + uneven_correction; return merged_size <= mtu; } |