diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /net/sched/cls_api.c | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'net/sched/cls_api.c')
| -rw-r--r-- | net/sched/cls_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 8eb79e92e94c..16e7ac9774e5 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c | |||
| @@ -227,7 +227,7 @@ replay: | |||
| 227 | err = -ENOENT; | 227 | err = -ENOENT; |
| 228 | tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND]); | 228 | tp_ops = tcf_proto_lookup_ops(tca[TCA_KIND]); |
| 229 | if (tp_ops == NULL) { | 229 | if (tp_ops == NULL) { |
| 230 | #ifdef CONFIG_KMOD | 230 | #ifdef CONFIG_MODULES |
| 231 | struct nlattr *kind = tca[TCA_KIND]; | 231 | struct nlattr *kind = tca[TCA_KIND]; |
| 232 | char name[IFNAMSIZ]; | 232 | char name[IFNAMSIZ]; |
| 233 | 233 | ||