[patch 10/38] CKRM e18: Move Callbacks from listenaq to socketclass

Gerrit Huizenga
2005-06-23T07:49:05Z

[-- Attachment #1: 06a-ckrm_net_cb --]
[-- Type: text/plain, Size: 1230 bytes --]

Signed-Off-By: Chandra Seetharaman <sekharan@us.ibm.com>
Signed-Off-By: 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.

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

Index: linux-2.6.12-ckrm1/net/ipv4/tcp.c
===================================================================
--- linux-2.6.12-ckrm1.orig/net/ipv4/tcp.c 2005-06-17 12:48:29.000000000 -0700
+++ linux-2.6.12-ckrm1/net/ipv4/tcp.c 2005-06-20 13:08:37.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>
@@ -496,7 +497,7 @@ int tcp_listen_start(struct sock *sk)

sk_dst_reset(sk);
sk->sk_prot->hash(sk);
-
+ ckrm_cb_listen_start(sk);
return 0;
}

@@ -529,6 +530,8 @@ static void tcp_listen_stop (struct sock
write_unlock_bh(&tp->syn_wait_lock);
tp->accept_queue = tp->accept_queue_tail = NULL;

+ ckrm_cb_listen_stop(sk);
+
if (lopt->qlen) {
for (i = 0; i < TCP_SYNQ_HSIZE; i++) {
while ((req = lopt->syn_table[i]) != NULL) {

--