batman-adv: Explicitly mark the common header structure

All batman-adv packets have a common 3 byte header. It can be used to share
some code between different code paths, but it was never explicit stated that
this header has to be always the same for all packets. Therefore, new code
changes always have the problem that they may accidently introduce regressions
by moving some elements around.

A new structure is introduced that contains the common header and makes it
easier visible that these 3 bytes have to be the same for all on-wire packets.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

1 files changed, 8 insertions, 8 deletions

diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
index 07d1c1da89dd..6f3c65952f53 100644
--- a/net/batman-adv/unicast.c
+++ b/net/batman-adv/unicast.c
@@ -67,7 +67,7 @@ static struct sk_buff *frag_merge_packet(struct list_head *head,
 
         memmove(skb->data + uni_diff, skb->data, hdr_len);
         unicast_packet = (struct unicast_packet *) skb_pull(skb, uni_diff);
-        unicast_packet->packet_type = BAT_UNICAST;
+        unicast_packet->header.packet_type = BAT_UNICAST;
 
         return skb;
 
@@ -251,9 +251,9 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
 
         memcpy(frag1, &tmp_uc, sizeof(tmp_uc));
 
-        frag1->ttl--;
-        frag1->version = COMPAT_VERSION;
-        frag1->packet_type = BAT_UNICAST_FRAG;
+        frag1->header.ttl--;
+        frag1->header.version = COMPAT_VERSION;
+        frag1->header.packet_type = BAT_UNICAST_FRAG;
 
         memcpy(frag1->orig, primary_if->net_dev->dev_addr, ETH_ALEN);
         memcpy(frag2, frag1, sizeof(*frag2));
@@ -320,11 +320,11 @@ find_router:
 
         unicast_packet = (struct unicast_packet *)skb->data;
 
-        unicast_packet->version = COMPAT_VERSION;
+        unicast_packet->header.version = COMPAT_VERSION;
         /* batman packet type: unicast */
-        unicast_packet->packet_type = BAT_UNICAST;
+        unicast_packet->header.packet_type = BAT_UNICAST;
         /* set unicast ttl */
-        unicast_packet->ttl = TTL;
+        unicast_packet->header.ttl = TTL;
         /* copy the destination for faster routing */
         memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
         /* set the destination tt version number */
@@ -335,7 +335,7 @@ find_router:
             data_len + sizeof(*unicast_packet) >
                                 neigh_node->if_incoming->net_dev->mtu) {
                 /* send frag skb decreases ttl */
-                unicast_packet->ttl++;
+                unicast_packet->header.ttl++;
                 ret = frag_send_skb(skb, bat_priv,
                                     neigh_node->if_incoming, neigh_node->addr);
                 goto out;