Skip to contentSkip to conversation

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

PATCH Applied Antonio Quartulli 2 participants 2 messages Feb 26, 2014 – Mar 11, 2014

lore
Share & tools
lore

Antonio Quartulli

author
#0 lore raw

PATCH v3 1/1 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 <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>

---

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(-)
icmp_socket.c +1 -1
index bf07dfd..161ef8f 100644
@@ -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;
routing.c +1 -1
index 3855132..3514153 100644
@@ -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++;
 	}
Signature · 1 line
1.8.4.5
Applied
#1 lore raw
Quoted 10 lines · 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 <[email protected]>
Signed-off-by Antonio Quartulli <[email protected]>

---

Changes from v2:
- added another fix in routing.c

Quoted 6 lines

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