diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:20:37 -0400 |
| commit | 23946a8a980d13af7b84bcf3ce023e0d166ec83f (patch) | |
| tree | 193d2959a7b62b48aaf2236447f1378779e55104 /net/ipv4/tcp_probe.c | |
| parent | 66e8bb97055ff22a0e5ea89c0a75a35f8738cc96 (diff) | |
| parent | 2b14c30b46e007a16c665cc86329bf4a1d9ff6ee (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'net/ipv4/tcp_probe.c')
| -rw-r--r-- | net/ipv4/tcp_probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c index d7d517a3a238..b3435324b573 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c | |||
| @@ -114,7 +114,7 @@ static int tcpprobe_open(struct inode * inode, struct file * file) | |||
| 114 | static ssize_t tcpprobe_read(struct file *file, char __user *buf, | 114 | static ssize_t tcpprobe_read(struct file *file, char __user *buf, |
| 115 | size_t len, loff_t *ppos) | 115 | size_t len, loff_t *ppos) |
| 116 | { | 116 | { |
| 117 | int error = 0, cnt; | 117 | int error = 0, cnt = 0; |
| 118 | unsigned char *tbuf; | 118 | unsigned char *tbuf; |
| 119 | 119 | ||
| 120 | if (!buf || len < 0) | 120 | if (!buf || len < 0) |