1 files changed, 10 insertions, 9 deletions

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index 1625e5793a89..4983340f1943 100644
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -392,12 +392,12 @@ batadv_add_packet(struct batadv_priv *bat_priv,
                 return NULL;
 
         len = sizeof(*packet) + vis_info_len;
-        info->skb_packet = dev_alloc_skb(len + ETH_HLEN + NET_IP_ALIGN);
+        info->skb_packet = netdev_alloc_skb_ip_align(NULL, len + ETH_HLEN);
         if (!info->skb_packet) {
                 kfree(info);
                 return NULL;
         }
-        skb_reserve(info->skb_packet, ETH_HLEN + NET_IP_ALIGN);
+        skb_reserve(info->skb_packet, ETH_HLEN);
         packet = (struct batadv_vis_packet *)skb_put(info->skb_packet, len);
 
         kref_init(&info->refcount);
@@ -697,7 +697,7 @@ static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv,
         struct batadv_orig_node *orig_node;
         struct batadv_vis_packet *packet;
         struct sk_buff *skb;
-        uint32_t i;
+        uint32_t i, res;
 
 
         packet = (struct batadv_vis_packet *)info->skb_packet->data;
@@ -724,7 +724,8 @@ static void batadv_broadcast_vis_packet(struct batadv_priv *bat_priv,
                         if (!skb)
                                 continue;
 
-                        if (!batadv_send_skb_to_orig(skb, orig_node, NULL))
+                        res = batadv_send_skb_to_orig(skb, orig_node, NULL);
+                        if (res == NET_XMIT_DROP)
                                 kfree_skb(skb);
                 }
                 rcu_read_unlock();
@@ -748,7 +749,7 @@ static void batadv_unicast_vis_packet(struct batadv_priv *bat_priv,
         if (!skb)
                 goto out;
 
-        if (!batadv_send_skb_to_orig(skb, orig_node, NULL))
+        if (batadv_send_skb_to_orig(skb, orig_node, NULL) == NET_XMIT_DROP)
                 kfree_skb(skb);
 
 out:
@@ -854,13 +855,13 @@ int batadv_vis_init(struct batadv_priv *bat_priv)
         if (!bat_priv->vis.my_info)
                 goto err;
 
-        len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE;
-        len += ETH_HLEN + NET_IP_ALIGN;
-        bat_priv->vis.my_info->skb_packet = dev_alloc_skb(len);
+        len = sizeof(*packet) + BATADV_MAX_VIS_PACKET_SIZE + ETH_HLEN;
+        bat_priv->vis.my_info->skb_packet = netdev_alloc_skb_ip_align(NULL,
+                                                                      len);
         if (!bat_priv->vis.my_info->skb_packet)
                 goto free_info;
 
-        skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN + NET_IP_ALIGN);
+        skb_reserve(bat_priv->vis.my_info->skb_packet, ETH_HLEN);
         tmp_skb = bat_priv->vis.my_info->skb_packet;
         packet = (struct batadv_vis_packet *)skb_put(tmp_skb, sizeof(*packet));