diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-14 23:23:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 23:23:54 -0400 |
| commit | 2aec609fb45e84d65bc8eabc7b650bbecb1cc179 (patch) | |
| tree | eb3e8a79604113392d0ee74b19dbc1dfce579c11 /net/ipv4/tcp_probe.c | |
| parent | 4c8894980010536915c4f5513ee180e3614aeca9 (diff) | |
| parent | 9076689ab07974a6f5d230fc241448f7a77e9078 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/netfilter/nf_conntrack_proto_tcp.c
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 5ff0ce6e9d..7ddc30f074 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c | |||
| @@ -224,7 +224,7 @@ static __init int tcpprobe_init(void) | |||
| 224 | if (bufsize < 0) | 224 | if (bufsize < 0) |
| 225 | return -EINVAL; | 225 | return -EINVAL; |
| 226 | 226 | ||
| 227 | tcp_probe.log = kcalloc(sizeof(struct tcp_log), bufsize, GFP_KERNEL); | 227 | tcp_probe.log = kcalloc(bufsize, sizeof(struct tcp_log), GFP_KERNEL); |
| 228 | if (!tcp_probe.log) | 228 | if (!tcp_probe.log) |
| 229 | goto err0; | 229 | goto err0; |
| 230 | 230 | ||