[v3] batman-adv: use the proper location in ether_addr_copy()
Commit Message
Introduced by: 513b2d107a4d88f62b9394926e377d2c6250775f
("batman-adv: prefer ether_addr_copy to memcpy")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
Changes from v2:
- added another fix in routing.c
Changes from v1:
- added Reported-by clause
icmp_socket.c | 2 +-
routing.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Comments
On Wednesday 26 February 2014 14:10:42 Antonio Quartulli wrote:
> Introduced by: 513b2d107a4d88f62b9394926e377d2c6250775f
> ("batman-adv: prefer ether_addr_copy to memcpy")
>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
> ---
>
> Changes from v2:
> - added another fix in routing.c
>
> Changes from v1:
> - added Reported-by clause
>
> icmp_socket.c | 2 +-
> routing.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Applied in revision 3b8bd3d.
Thanks,
Marek
@@ -230,7 +230,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff,
icmp_packet_rr = (struct batadv_icmp_packet_rr *)icmp_header;
if (packet_len == sizeof(*icmp_packet_rr)) {
addr = neigh_node->if_incoming->net_dev->dev_addr;
- ether_addr_copy(icmp_packet_rr->rr, addr);
+ ether_addr_copy(icmp_packet_rr->rr[0], addr);
}
break;
@@ -340,7 +340,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb,
if (icmp_packet_rr->rr_cur >= BATADV_RR_LEN)
goto out;
- ether_addr_copy(&(icmp_packet_rr->rr[icmp_packet_rr->rr_cur]),
+ ether_addr_copy(icmp_packet_rr->rr[icmp_packet_rr->rr_cur],
ethhdr->h_dest);
icmp_packet_rr->rr_cur++;
}