aboutsummaryrefslogtreecommitdiffstats
path: root/net/batman-adv/distributed-arp-table.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/batman-adv/distributed-arp-table.c')
-rw-r--r--net/batman-adv/distributed-arp-table.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index f07ec320dc01..99da41290f82 100644
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -29,7 +29,6 @@
29#include "send.h" 29#include "send.h"
30#include "types.h" 30#include "types.h"
31#include "translation-table.h" 31#include "translation-table.h"
32#include "unicast.h"
33 32
34static void batadv_dat_purge(struct work_struct *work); 33static void batadv_dat_purge(struct work_struct *work);
35 34
@@ -592,9 +591,9 @@ static bool batadv_dat_send_data(struct batadv_priv *bat_priv,
592 goto free_orig; 591 goto free_orig;
593 592
594 tmp_skb = pskb_copy(skb, GFP_ATOMIC); 593 tmp_skb = pskb_copy(skb, GFP_ATOMIC);
595 if (!batadv_unicast_4addr_prepare_skb(bat_priv, tmp_skb, 594 if (!batadv_send_skb_prepare_unicast_4addr(bat_priv, tmp_skb,
596 cand[i].orig_node, 595 cand[i].orig_node,
597 packet_subtype)) { 596 packet_subtype)) {
598 kfree_skb(tmp_skb); 597 kfree_skb(tmp_skb);
599 goto free_neigh; 598 goto free_neigh;
600 } 599 }
@@ -990,10 +989,10 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
990 * that a node not using the 4addr packet format doesn't support it. 989 * that a node not using the 4addr packet format doesn't support it.
991 */ 990 */
992 if (hdr_size == sizeof(struct batadv_unicast_4addr_packet)) 991 if (hdr_size == sizeof(struct batadv_unicast_4addr_packet))
993 err = batadv_unicast_4addr_send_skb(bat_priv, skb_new, 992 err = batadv_send_skb_unicast_4addr(bat_priv, skb_new,
994 BATADV_P_DAT_CACHE_REPLY); 993 BATADV_P_DAT_CACHE_REPLY);
995 else 994 else
996 err = batadv_unicast_send_skb(bat_priv, skb_new); 995 err = batadv_send_skb_unicast(bat_priv, skb_new);
997 996
998 if (!err) { 997 if (!err) {
999 batadv_inc_counter(bat_priv, BATADV_CNT_DAT_CACHED_REPLY_TX); 998 batadv_inc_counter(bat_priv, BATADV_CNT_DAT_CACHED_REPLY_TX);