diff options
| author | Neil Brown <neilb@suse.de> | 2008-07-11 21:57:40 +1000 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2008-07-11 21:57:40 +1000 |
| commit | 0306d5efbf897c7d410fd30b89fc7d97372aa501 (patch) | |
| tree | 668811bca39ca7c1585da88d52ec2f0a43216c0e /net/ipv4/tcp_probe.c | |
| parent | f9f278fefdbbbf198bb4111b3fba47d9043dae59 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' into for-next
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 5ff0ce6e9d3..7ddc30f0744 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c @@ -224,7 +224,7 @@ static __init int tcpprobe_init(void) if (bufsize < 0) return -EINVAL; - tcp_probe.log = kcalloc(sizeof(struct tcp_log), bufsize, GFP_KERNEL); + tcp_probe.log = kcalloc(bufsize, sizeof(struct tcp_log), GFP_KERNEL); if (!tcp_probe.log) goto err0; |