---

yaml --- r: 78677 b: refs/heads/master c: 6e32814 h: refs/heads/master i: 78675: 254d36c v: v3
git-mirror · Jan 28, 2008 · 1fa3fb4 · 1fa3fb4
1 parent 21b22a9
commit 1fa3fb4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 {