From 1fa3fb4e69437c8972ee0290977b0969c27b6714 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Fri, 4 Jan 2008 01:59:42 -0800
Subject: [PATCH] --- yaml --- r: 78677 b: refs/heads/master c:
 6e32814bc89e7103e2b75b841155faf51f60a8f1 h: refs/heads/master i:   78675:
 254d36c9b6aeb02123f57fecf3025bdf3f09ae53 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/connector/cn_queue.c | 1 -
 trunk/include/linux/connector.h    | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 56e359d003d2..88bfe4f9cc82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96a899655e2c3ba53f083eda69706ee4eb05271f
+refs/heads/master: 6e32814bc89e7103e2b75b841155faf51f60a8f1
diff --git a/trunk/drivers/connector/cn_queue.c b/trunk/drivers/connector/cn_queue.c
index dbda08c7b3db..5732ca3259f9 100644
--- a/trunk/drivers/connector/cn_queue.c
+++ b/trunk/drivers/connector/cn_queue.c
@@ -104,7 +104,6 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id
 		return -EINVAL;
 	}
 
-	cbq->nls = dev->nls;
 	cbq->seq = 0;
 	cbq->group = cbq->id.id.idx;
 
diff --git a/trunk/include/linux/connector.h b/trunk/include/linux/connector.h
index 7e18311d655e..da6dd957f908 100644
--- a/trunk/include/linux/connector.h
+++ b/trunk/include/linux/connector.h
@@ -132,15 +132,13 @@ struct cn_callback_data {
 
 struct cn_callback_entry {
 	struct list_head callback_entry;
-	struct cn_callback *cb;
 	struct work_struct work;
 	struct cn_queue_dev *pdev;
 
 	struct cn_callback_id id;
 	struct cn_callback_data data;
 
-	int seq, group;
-	struct sock *nls;
+	u32 seq, group;
 };
 
 struct cn_ctl_entry {