diff --git a/[refs] b/[refs]
index 38c14e22d688..20fdf31d37c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69497c17c6ffc636e463d528c2f4c87e4d894964
+refs/heads/master: c00b6856fc642b234895cfabd15b289e76726430
diff --git a/trunk/net/batman-adv/icmp_socket.c b/trunk/net/batman-adv/icmp_socket.c
index defd6929ceae..88ab26f5f726 100644
--- a/trunk/net/batman-adv/icmp_socket.c
+++ b/trunk/net/batman-adv/icmp_socket.c
@@ -136,8 +136,8 @@ static ssize_t bat_socket_read(struct file *file, char __user *buf,
 
 	spin_unlock_bh(&socket_client->lock);
 
-	error = __copy_to_user(buf, &socket_packet->icmp_packet,
-			       socket_packet->icmp_len);
+	error = copy_to_user(buf, &socket_packet->icmp_packet,
+			     socket_packet->icmp_len);
 
 	packet_len = socket_packet->icmp_len;
 	kfree(socket_packet);