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
--- devel/net/ipv4/tcp.c~ckrm-move-callbacks-from-listenaq-to-socketclass	2005-07-25 19:08:27.000000000 -0700
+++ devel-akpm/net/ipv4/tcp.c	2005-07-25 19:09:45.000000000 -0700
@@ -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;
 	}
 
@@ -507,6 +508,8 @@ static void tcp_listen_stop (struct sock
 	/* make all the listen_opt local to us */
 	acc_req = reqsk_queue_yank_acceptq(&tp->accept_queue);
 
+	ckrm_cb_listen_stop(sk);
+
 	/* Following specs, it would be better either to send FIN
 	 * (and enter FIN-WAIT-1, it is normal close)
 	 * or to send active reset (abort).
_