From 629f805594f9f9f40102e79cbd5c6707de188b78 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Mon, 19 May 2008 13:27:31 -0700
Subject: [PATCH] --- yaml --- r: 102589 b: refs/heads/master c:
 e15f880409c807bb589e9492263564e80f0de6e9 h: refs/heads/master i:   102587:
 705b9b14684083e1a96f1c06e389ffa2093b2ad2 v: v3

---
 [refs]                  | 2 +-
 trunk/net/tipc/subscr.c | 4 +++-
 trunk/net/tipc/subscr.h | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1aafaeee48c2..a4467b4b4b88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 236ae64063faf7d3398b4f9a889421b0d27a69d2
+refs/heads/master: e15f880409c807bb589e9492263564e80f0de6e9
diff --git a/trunk/net/tipc/subscr.c b/trunk/net/tipc/subscr.c
index 8f8d0a6c1c16..81e2bd5f2413 100644
--- a/trunk/net/tipc/subscr.c
+++ b/trunk/net/tipc/subscr.c
@@ -157,7 +157,8 @@ void tipc_subscr_report_overlap(struct subscription *sub,
 		return;
 	if (!must && !(sub->filter & TIPC_SUB_PORTS))
 		return;
-	subscr_send_event(sub, found_lower, found_upper, event, port_ref, node);
+
+	sub->event_cb(sub, found_lower, found_upper, event, port_ref, node);
 }
 
 /**
@@ -372,6 +373,7 @@ static void subscr_subscribe(struct tipc_subscr *s,
 		subscr_terminate(subscriber);
 		return;
 	}
+	sub->event_cb = subscr_send_event;
 	memcpy(&sub->evt.s, s, sizeof(struct tipc_subscr));
 	INIT_LIST_HEAD(&sub->subscription_list);
 	INIT_LIST_HEAD(&sub->nameseq_list);
diff --git a/trunk/net/tipc/subscr.h b/trunk/net/tipc/subscr.h
index 93a8e674fac1..d95536832907 100644
--- a/trunk/net/tipc/subscr.h
+++ b/trunk/net/tipc/subscr.h
@@ -37,11 +37,18 @@
 #ifndef _TIPC_SUBSCR_H
 #define _TIPC_SUBSCR_H
 
+struct subscription;
+
+typedef void (*tipc_subscr_event) (struct subscription *sub,
+				   u32 found_lower, u32 found_upper,
+				   u32 event, u32 port_ref, u32 node);
+
 /**
  * struct subscription - TIPC network topology subscription object
  * @seq: name sequence associated with subscription
  * @timeout: duration of subscription (in ms)
  * @filter: event filtering to be done for subscription
+ * @event_cb: routine invoked when a subscription event is detected
  * @evt: template for events generated by subscription
  * @subscription_list: adjacent subscriptions in subscriber's subscription list
  * @nameseq_list: adjacent subscriptions in name sequence's subscription list
@@ -53,6 +60,7 @@ struct subscription {
 	struct tipc_name_seq seq;
 	u32 timeout;
 	u32 filter;
+	tipc_subscr_event event_cb;
 	struct tipc_event evt;
 	struct list_head subscription_list;
 	struct list_head nameseq_list;