Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33338
b: refs/heads/master
c: 18b6fe6
h: refs/heads/master
v: v3
  • Loading branch information
David S. Miller committed Aug 14, 2006
1 parent e6875e0 commit ccbcc4c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f54fa84dda211f68f65002efa44142207c886c79
refs/heads/master: 18b6fe64d4d1f6e0a2c71429a5e5074f43e29203
3 changes: 2 additions & 1 deletion trunk/net/ipv4/tcp_probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,12 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
error = wait_event_interruptible(tcpw.wait,
__kfifo_len(tcpw.fifo) != 0);
if (error)
return error;
goto out_free;

cnt = kfifo_get(tcpw.fifo, tbuf, len);
error = copy_to_user(buf, tbuf, cnt);

out_free:
vfree(tbuf);

return error ? error : cnt;
Expand Down

0 comments on commit ccbcc4c

Please sign in to comment.