git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /repos/git/net-next-2.6
[pandora-kernel.git]
/
net
/
sched
/
Kconfig
diff --git
a/net/sched/Kconfig
b/net/sched/Kconfig
index
f04d4a4
..
2040553
100644
(file)
--- a/
net/sched/Kconfig
+++ b/
net/sched/Kconfig
@@
-243,7
+243,7
@@
config NET_CLS_TCINDEX
config NET_CLS_ROUTE4
tristate "Routing decision (ROUTE)"
config NET_CLS_ROUTE4
tristate "Routing decision (ROUTE)"
- select
NET_CLS_ROUTE
+ select
IP_ROUTE_CLASSID
select NET_CLS
---help---
If you say Y here, you will be able to classify packets
select NET_CLS
---help---
If you say Y here, you will be able to classify packets
@@
-252,9
+252,6
@@
config NET_CLS_ROUTE4
To compile this code as a module, choose M here: the
module will be called cls_route.
To compile this code as a module, choose M here: the
module will be called cls_route.
-config NET_CLS_ROUTE
- bool
-
config NET_CLS_FW
tristate "Netfilter mark (FW)"
select NET_CLS
config NET_CLS_FW
tristate "Netfilter mark (FW)"
select NET_CLS