diff options
author | Christoph Lameter <clameter@sgi.com> | 2008-02-27 14:07:10 -0500 |
---|---|---|
committer | Christoph Lameter <clameter@sgi.com> | 2008-02-27 14:07:10 -0500 |
commit | 9ef64cb4320df821638b508f79aa8b858cca99f0 (patch) | |
tree | 4efbf0854234f89c6f4413077ec795fc669b5b0a /net/sctp/socket.c | |
parent | 6f157c1d268d5888ca44c589dccd01729c4172f6 (diff) | |
parent | 7704a8b6fc4a8f51599eb2af4dcf1e2ac9c7e576 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/sctp/socket.c')
-rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d47d5787e2e5..44797ad88a05 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -6488,6 +6488,7 @@ struct proto sctp_prot = { | |||
6488 | .memory_pressure = &sctp_memory_pressure, | 6488 | .memory_pressure = &sctp_memory_pressure, |
6489 | .enter_memory_pressure = sctp_enter_memory_pressure, | 6489 | .enter_memory_pressure = sctp_enter_memory_pressure, |
6490 | .memory_allocated = &sctp_memory_allocated, | 6490 | .memory_allocated = &sctp_memory_allocated, |
6491 | .sockets_allocated = &sctp_sockets_allocated, | ||
6491 | REF_PROTO_INUSE(sctp) | 6492 | REF_PROTO_INUSE(sctp) |
6492 | }; | 6493 | }; |
6493 | 6494 | ||
@@ -6521,6 +6522,7 @@ struct proto sctpv6_prot = { | |||
6521 | .memory_pressure = &sctp_memory_pressure, | 6522 | .memory_pressure = &sctp_memory_pressure, |
6522 | .enter_memory_pressure = sctp_enter_memory_pressure, | 6523 | .enter_memory_pressure = sctp_enter_memory_pressure, |
6523 | .memory_allocated = &sctp_memory_allocated, | 6524 | .memory_allocated = &sctp_memory_allocated, |
6525 | .sockets_allocated = &sctp_sockets_allocated, | ||
6524 | REF_PROTO_INUSE(sctpv6) | 6526 | REF_PROTO_INUSE(sctpv6) |
6525 | }; | 6527 | }; |
6526 | #endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */ | 6528 | #endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */ |