diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-11-03 13:31:05 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-03 18:50:50 -0700 |
| commit | c00b2c9e79466d61979cd21af526cc6d5d0ee04f (patch) | |
| tree | 300e44d04f76b860580cb1ca5f0fc7b37112375a /net/sched/cls_cgroup.c | |
| parent | a6331d6f9a4298173b413cf99a40cc86a9d92c37 (diff) | |
cls_cgroup: Fix crash on module unload
Somewhere along the lines net_cls_subsys_id became a macro when
cls_cgroup is built as a module. Not only did it make cls_cgroup
completely useless, it also causes it to crash on module unload.
This patch fixes this by removing that macro.
Thanks to Eric Dumazet for diagnosing this problem.
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_cgroup.c')
| -rw-r--r-- | net/sched/cls_cgroup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/sched/cls_cgroup.c b/net/sched/cls_cgroup.c index 37dff78e9cb1..d49c40fb7e09 100644 --- a/net/sched/cls_cgroup.c +++ b/net/sched/cls_cgroup.c @@ -34,8 +34,6 @@ struct cgroup_subsys net_cls_subsys = { .populate = cgrp_populate, #ifdef CONFIG_NET_CLS_CGROUP .subsys_id = net_cls_subsys_id, -#else -#define net_cls_subsys_id net_cls_subsys.subsys_id #endif .module = THIS_MODULE, }; |