diff --git a/[refs] b/[refs] index eb51c26507b1..56e359d003d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00f5e06c032507206c4ac0c846ad82b75ae7665b +refs/heads/master: 96a899655e2c3ba53f083eda69706ee4eb05271f diff --git a/trunk/drivers/connector/cn_queue.c b/trunk/drivers/connector/cn_queue.c index 12ceed54ab18..dbda08c7b3db 100644 --- a/trunk/drivers/connector/cn_queue.c +++ b/trunk/drivers/connector/cn_queue.c @@ -146,7 +146,6 @@ struct cn_queue_dev *cn_queue_alloc_dev(char *name, struct sock *nls) spin_lock_init(&dev->queue_lock); dev->nls = nls; - dev->netlink_groups = 0; dev->cn_queue = create_workqueue(dev->name); if (!dev->cn_queue) { diff --git a/trunk/include/linux/connector.h b/trunk/include/linux/connector.h index 13fc4541bf23..7e18311d655e 100644 --- a/trunk/include/linux/connector.h +++ b/trunk/include/linux/connector.h @@ -112,7 +112,6 @@ struct cn_queue_dev { struct list_head queue_list; spinlock_t queue_lock; - int netlink_groups; struct sock *nls; };