From: Gerrit Huizenga <gh@us.ibm.com>

Callbacks are not called from appropriate places in the socketclass patch. 
The patch was wrongly present in the listenaq controller.  Moving from
listenaq controller to socketclass patch.

Signed-Off-By: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-Off-By: Gerrit Huizenga <gh@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 net/ipv4/tcp.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff -puN net/ipv4/tcp.c~ckrm-move-callbacks-from-listenaq-to-socketclass net/ipv4/tcp.c
--- 25/net/ipv4/tcp.c~ckrm-move-callbacks-from-listenaq-to-socketclass	Wed Jul 13 14:44:03 2005
+++ 25-akpm/net/ipv4/tcp.c	Wed Jul 13 14:44:03 2005
@@ -263,6 +263,7 @@
 #include <net/xfrm.h>
 #include <net/ip.h>
 
+#include <linux/ckrm_events.h>
 
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
@@ -482,7 +483,7 @@ int tcp_listen_start(struct sock *sk)
 
 		sk_dst_reset(sk);
 		sk->sk_prot->hash(sk);
-
+		ckrm_cb_listen_start(sk);
 		return 0;
 	}
 
@@ -510,6 +511,8 @@ static void tcp_listen_stop (struct sock
 	lopt = reqsk_queue_yank_listen_sk(&tp->accept_queue);
 	acc_req = reqsk_queue_yank_acceptq(&tp->accept_queue);
 
+	ckrm_cb_listen_stop(sk);
+
 	if (lopt->qlen) {
 		for (i = 0; i < TCP_SYNQ_HSIZE; i++) {
 			while ((req = lopt->syn_table[i]) != NULL) {
_