batman-adv: Prefix packet structs with batadv_

Reported-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 46 insertions, 42 deletions

diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 86d444a87bde..e15790761105 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -217,7 +217,7 @@ out:
 void
 batadv_bonding_save_primary(const struct orig_node *orig_node,
                             struct orig_node *orig_neigh_node,
-                            const struct batman_ogm_packet *batman_ogm_packet)
+                            const struct batadv_ogm_packet *batman_ogm_packet)
 {
         if (!(batman_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP))
                 return;
@@ -284,10 +284,10 @@ static int batadv_recv_my_icmp_packet(struct bat_priv *bat_priv,
         struct hard_iface *primary_if = NULL;
         struct orig_node *orig_node = NULL;
         struct neigh_node *router = NULL;
-        struct icmp_packet_rr *icmp_packet;
+        struct batadv_icmp_packet_rr *icmp_packet;
         int ret = NET_RX_DROP;
 
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
 
         /* add data to device queue */
         if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) {
@@ -313,7 +313,7 @@ static int batadv_recv_my_icmp_packet(struct bat_priv *bat_priv,
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
 
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
 
         memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN);
         memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN);
@@ -339,10 +339,10 @@ static int batadv_recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,
         struct hard_iface *primary_if = NULL;
         struct orig_node *orig_node = NULL;
         struct neigh_node *router = NULL;
-        struct icmp_packet *icmp_packet;
+        struct batadv_icmp_packet *icmp_packet;
         int ret = NET_RX_DROP;
 
-        icmp_packet = (struct icmp_packet *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet *)skb->data;
 
         /* send TTL exceeded if packet is an echo request (traceroute) */
         if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) {
@@ -368,7 +368,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct bat_priv *bat_priv,
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
 
-        icmp_packet = (struct icmp_packet *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet *)skb->data;
 
         memcpy(icmp_packet->dst, icmp_packet->orig, ETH_ALEN);
         memcpy(icmp_packet->orig, primary_if->net_dev->dev_addr, ETH_ALEN);
@@ -392,16 +392,16 @@ out:
 int batadv_recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if)
 {
         struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct icmp_packet_rr *icmp_packet;
+        struct batadv_icmp_packet_rr *icmp_packet;
         struct ethhdr *ethhdr;
         struct orig_node *orig_node = NULL;
         struct neigh_node *router = NULL;
-        int hdr_size = sizeof(struct icmp_packet);
+        int hdr_size = sizeof(struct batadv_icmp_packet);
         int ret = NET_RX_DROP;
 
         /* we truncate all incoming icmp packets if they don't match our size */
-        if (skb->len >= sizeof(struct icmp_packet_rr))
-                hdr_size = sizeof(struct icmp_packet_rr);
+        if (skb->len >= sizeof(struct batadv_icmp_packet_rr))
+                hdr_size = sizeof(struct batadv_icmp_packet_rr);
 
         /* drop packet if it has not necessary minimum size */
         if (unlikely(!pskb_may_pull(skb, hdr_size)))
@@ -421,10 +421,10 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if (!batadv_is_my_mac(ethhdr->h_dest))
                 goto out;
 
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
 
         /* add record route information if not full */
-        if ((hdr_size == sizeof(struct icmp_packet_rr)) &&
+        if ((hdr_size == sizeof(struct batadv_icmp_packet_rr)) &&
             (icmp_packet->rr_cur < BATADV_RR_LEN)) {
                 memcpy(&(icmp_packet->rr[icmp_packet->rr_cur]),
                        ethhdr->h_dest, ETH_ALEN);
@@ -452,7 +452,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
 
-        icmp_packet = (struct icmp_packet_rr *)skb->data;
+        icmp_packet = (struct batadv_icmp_packet_rr *)skb->data;
 
         /* decrement ttl */
         icmp_packet->header.ttl--;
@@ -580,17 +580,19 @@ batadv_find_ifalter_router(struct orig_node *primary_orig,
 int batadv_recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)
 {
         struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct tt_query_packet *tt_query;
+        struct batadv_tt_query_packet *tt_query;
         uint16_t tt_size;
         struct ethhdr *ethhdr;
         char tt_flag;
+        size_t packet_size;
 
         /* drop packet if it has not necessary minimum size */
-        if (unlikely(!pskb_may_pull(skb, sizeof(struct tt_query_packet))))
+        if (unlikely(!pskb_may_pull(skb,
+                                    sizeof(struct batadv_tt_query_packet))))
                 goto out;
 
         /* I could need to modify it */
-        if (skb_cow(skb, sizeof(struct tt_query_packet)) < 0)
+        if (skb_cow(skb, sizeof(struct batadv_tt_query_packet)) < 0)
                 goto out;
 
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
@@ -603,7 +605,7 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)
         if (is_broadcast_ether_addr(ethhdr->h_source))
                 goto out;
 
-        tt_query = (struct tt_query_packet *)skb->data;
+        tt_query = (struct batadv_tt_query_packet *)skb->data;
 
         switch (tt_query->flags & BATADV_TT_QUERY_TYPE_MASK) {
         case BATADV_TT_REQUEST:
@@ -635,13 +637,14 @@ int batadv_recv_tt_query(struct sk_buff *skb, struct hard_iface *recv_if)
                         if (skb_linearize(skb) < 0)
                                 goto out;
                         /* skb_linearize() possibly changed skb->data */
-                        tt_query = (struct tt_query_packet *)skb->data;
+                        tt_query = (struct batadv_tt_query_packet *)skb->data;
 
                         tt_size = batadv_tt_len(ntohs(tt_query->tt_data));
 
                         /* Ensure we have all the claimed data */
-                        if (unlikely(skb_headlen(skb) <
-                                     sizeof(struct tt_query_packet) + tt_size))
+                        packet_size = sizeof(struct batadv_tt_query_packet);
+                        packet_size += tt_size;
+                        if (unlikely(skb_headlen(skb) < packet_size))
                                 goto out;
 
                         batadv_handle_tt_response(bat_priv, tt_query);
@@ -667,12 +670,13 @@ out:
 int batadv_recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if)
 {
         struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct roam_adv_packet *roam_adv_packet;
+        struct batadv_roam_adv_packet *roam_adv_packet;
         struct orig_node *orig_node;
         struct ethhdr *ethhdr;
 
         /* drop packet if it has not necessary minimum size */
-        if (unlikely(!pskb_may_pull(skb, sizeof(struct roam_adv_packet))))
+        if (unlikely(!pskb_may_pull(skb,
+                                    sizeof(struct batadv_roam_adv_packet))))
                 goto out;
 
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
@@ -687,7 +691,7 @@ int batadv_recv_roam_adv(struct sk_buff *skb, struct hard_iface *recv_if)
 
         batadv_inc_counter(bat_priv, BATADV_CNT_TT_ROAM_ADV_RX);
 
-        roam_adv_packet = (struct roam_adv_packet *)skb->data;
+        roam_adv_packet = (struct batadv_roam_adv_packet *)skb->data;
 
         if (!batadv_is_my_mac(roam_adv_packet->dst))
                 return batadv_route_unicast_packet(skb, recv_if);
@@ -843,12 +847,12 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
         struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
         struct orig_node *orig_node = NULL;
         struct neigh_node *neigh_node = NULL;
-        struct unicast_packet *unicast_packet;
+        struct batadv_unicast_packet *unicast_packet;
         struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb);
         int ret = NET_RX_DROP;
         struct sk_buff *new_skb;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
         /* TTL exceeded */
         if (unicast_packet->header.ttl < 2) {
@@ -873,7 +877,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
         if (skb_cow(skb, ETH_HLEN) < 0)
                 goto out;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
         if (unicast_packet->header.packet_type == BATADV_UNICAST &&
             atomic_read(&bat_priv->fragmentation) &&
@@ -900,7 +904,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb,
                 }
 
                 skb = new_skb;
-                unicast_packet = (struct unicast_packet *)skb->data;
+                unicast_packet = (struct batadv_unicast_packet *)skb->data;
         }
 
         /* decrement ttl */
@@ -929,15 +933,15 @@ static int batadv_check_unicast_ttvn(struct bat_priv *bat_priv,
         struct orig_node *orig_node;
         struct ethhdr *ethhdr;
         struct hard_iface *primary_if;
-        struct unicast_packet *unicast_packet;
+        struct batadv_unicast_packet *unicast_packet;
         bool tt_poss_change;
         int is_old_ttvn;
 
         /* I could need to modify it */
-        if (skb_cow(skb, sizeof(struct unicast_packet)) < 0)
+        if (skb_cow(skb, sizeof(struct batadv_unicast_packet)) < 0)
                 return 0;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
         if (batadv_is_my_mac(unicast_packet->dest)) {
                 tt_poss_change = bat_priv->tt_poss_change;
@@ -958,12 +962,12 @@ static int batadv_check_unicast_ttvn(struct bat_priv *bat_priv,
         is_old_ttvn = batadv_seq_before(unicast_packet->ttvn, curr_ttvn);
         if (is_old_ttvn || tt_poss_change) {
                 /* check if there is enough data before accessing it */
-                if (pskb_may_pull(skb, sizeof(struct unicast_packet) +
+                if (pskb_may_pull(skb, sizeof(struct batadv_unicast_packet) +
                                   ETH_HLEN) < 0)
                         return 0;
 
                 ethhdr = (struct ethhdr *)(skb->data +
-                        sizeof(struct unicast_packet));
+                        sizeof(struct batadv_unicast_packet));
 
                 /* we don't have an updated route for this client, so we should
                  * not try to reroute the packet!!
@@ -1005,7 +1009,7 @@ static int batadv_check_unicast_ttvn(struct bat_priv *bat_priv,
 int batadv_recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
 {
         struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct unicast_packet *unicast_packet;
+        struct batadv_unicast_packet *unicast_packet;
         int hdr_size = sizeof(*unicast_packet);
 
         if (batadv_check_unicast_packet(skb, hdr_size) < 0)
@@ -1014,7 +1018,7 @@ int batadv_recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if (!batadv_check_unicast_ttvn(bat_priv, skb))
                 return NET_RX_DROP;
 
-        unicast_packet = (struct unicast_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_packet *)skb->data;
 
         /* packet for me */
         if (batadv_is_my_mac(unicast_packet->dest)) {
@@ -1030,7 +1034,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
                                   struct hard_iface *recv_if)
 {
         struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
-        struct unicast_frag_packet *unicast_packet;
+        struct batadv_unicast_frag_packet *unicast_packet;
         int hdr_size = sizeof(*unicast_packet);
         struct sk_buff *new_skb = NULL;
         int ret;
@@ -1041,7 +1045,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
         if (!batadv_check_unicast_ttvn(bat_priv, skb))
                 return NET_RX_DROP;
 
-        unicast_packet = (struct unicast_frag_packet *)skb->data;
+        unicast_packet = (struct batadv_unicast_frag_packet *)skb->data;
 
         /* packet for me */
         if (batadv_is_my_mac(unicast_packet->dest)) {
@@ -1056,7 +1060,7 @@ int batadv_recv_ucast_frag_packet(struct sk_buff *skb,
                         return NET_RX_SUCCESS;
 
                 batadv_interface_rx(recv_if->soft_iface, new_skb, recv_if,
-                                    sizeof(struct unicast_packet));
+                                    sizeof(struct batadv_unicast_packet));
                 return NET_RX_SUCCESS;
         }
 
@@ -1068,7 +1072,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
 {
         struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
         struct orig_node *orig_node = NULL;
-        struct bcast_packet *bcast_packet;
+        struct batadv_bcast_packet *bcast_packet;
         struct ethhdr *ethhdr;
         int hdr_size = sizeof(*bcast_packet);
         int ret = NET_RX_DROP;
@@ -1092,7 +1096,7 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if (batadv_is_my_mac(ethhdr->h_source))
                 goto out;
 
-        bcast_packet = (struct bcast_packet *)skb->data;
+        bcast_packet = (struct batadv_bcast_packet *)skb->data;
 
         /* ignore broadcasts originated by myself */
         if (batadv_is_my_mac(bcast_packet->orig))
@@ -1156,7 +1160,7 @@ out:
 
 int batadv_recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if)
 {
-        struct vis_packet *vis_packet;
+        struct batadv_vis_packet *vis_packet;
         struct ethhdr *ethhdr;
         struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
         int hdr_size = sizeof(*vis_packet);
@@ -1168,7 +1172,7 @@ int batadv_recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if)
         if (unlikely(!pskb_may_pull(skb, hdr_size)))
                 return NET_RX_DROP;
 
-        vis_packet = (struct vis_packet *)skb->data;
+        vis_packet = (struct batadv_vis_packet *)skb->data;
         ethhdr = (struct ethhdr *)skb_mac_header(skb);
 
         /* not for me */