Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 3b8bd3d7a9363dd14e79cb2937338627edd900f1 Author: Antonio Quartulli antonio@meshcoding.com Date: Wed Feb 26 14:10:42 2014 +0100

batman-adv: use the proper location in ether_addr_copy()

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 Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

3b8bd3d7a9363dd14e79cb2937338627edd900f1 icmp_socket.c | 2 +- routing.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/icmp_socket.c b/icmp_socket.c index bf07dfd..161ef8f 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -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; diff --git a/routing.c b/routing.c index 3855132..3514153 100644 --- a/routing.c +++ b/routing.c @@ -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++; }