---

yaml --- r: 278756 b: refs/heads/master c: c00b685 h: refs/heads/master v: v3
git-mirror · Dec 12, 2011 · 152b365 · 152b365
1 parent 11c6eae
commit 152b365
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);