diff options
Diffstat (limited to 'net/batman-adv/bat_iv_ogm.c')
-rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 8323bced8e5b..b3bd4ec3fd94 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c | |||
@@ -347,10 +347,10 @@ static void batadv_iv_ogm_iface_update_mac(struct batadv_hard_iface *hard_iface) | |||
347 | unsigned char *ogm_buff = hard_iface->bat_iv.ogm_buff; | 347 | unsigned char *ogm_buff = hard_iface->bat_iv.ogm_buff; |
348 | 348 | ||
349 | batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; | 349 | batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; |
350 | memcpy(batadv_ogm_packet->orig, | 350 | ether_addr_copy(batadv_ogm_packet->orig, |
351 | hard_iface->net_dev->dev_addr, ETH_ALEN); | 351 | hard_iface->net_dev->dev_addr); |
352 | memcpy(batadv_ogm_packet->prev_sender, | 352 | ether_addr_copy(batadv_ogm_packet->prev_sender, |
353 | hard_iface->net_dev->dev_addr, ETH_ALEN); | 353 | hard_iface->net_dev->dev_addr); |
354 | } | 354 | } |
355 | 355 | ||
356 | static void | 356 | static void |
@@ -830,7 +830,7 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, | |||
830 | tvlv_len = ntohs(batadv_ogm_packet->tvlv_len); | 830 | tvlv_len = ntohs(batadv_ogm_packet->tvlv_len); |
831 | 831 | ||
832 | batadv_ogm_packet->ttl--; | 832 | batadv_ogm_packet->ttl--; |
833 | memcpy(batadv_ogm_packet->prev_sender, ethhdr->h_source, ETH_ALEN); | 833 | ether_addr_copy(batadv_ogm_packet->prev_sender, ethhdr->h_source); |
834 | 834 | ||
835 | /* apply hop penalty */ | 835 | /* apply hop penalty */ |
836 | batadv_ogm_packet->tq = batadv_hop_penalty(batadv_ogm_packet->tq, | 836 | batadv_ogm_packet->tq = batadv_hop_penalty(batadv_ogm_packet->tq, |