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/act_api.c | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'net/sched/act_api.c')
| -rw-r--r-- | net/sched/act_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 9974b3f04f05..8f457f1e0acf 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
| @@ -494,7 +494,7 @@ struct tc_action *tcf_action_init_1(struct nlattr *nla, struct nlattr *est, | |||
| 494 | 494 | ||
| 495 | a_o = tc_lookup_action_n(act_name); | 495 | a_o = tc_lookup_action_n(act_name); |
| 496 | if (a_o == NULL) { | 496 | if (a_o == NULL) { |
| 497 | #ifdef CONFIG_KMOD | 497 | #ifdef CONFIG_MODULES |
| 498 | rtnl_unlock(); | 498 | rtnl_unlock(); |
| 499 | request_module("act_%s", act_name); | 499 | request_module("act_%s", act_name); |
| 500 | rtnl_lock(); | 500 | rtnl_lock(); |