---

yaml
---
r: 79295
b: refs/heads/master
c: 645a1e3
h: refs/heads/master
i:
  79293: 3ccfa7f
  79291: 0e40748
  79287: abcf5c8
  79279: a5f40e1
  79263: 9452601
  79231: f1a3189
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6ee877f2e4c4d44c934528b4cec6c8d7f54d3ad
+refs/heads/master: 645a1e39e4e3e84a275c5e4a7c8049041146f9b5

trunk/net/sched/Kconfig

@@ -198,6 +198,7 @@ config NET_SCH_NETEM
 
 config NET_SCH_INGRESS
 	tristate "Ingress Qdisc"
+	depends on NET_CLS_ACT || NETFILTER
 	---help---
 	  Say Y here if you want to use classifiers for incoming packets.
 	  If unsure, say Y.

trunk/net/sched/sch_ingress.c

@@ -162,19 +162,10 @@ static struct nf_hook_ops ing_ops[] __read_mostly = {
 
 static int ingress_init(struct Qdisc *sch, struct rtattr *opt)
 {
-	/* Make sure either netfilter or preferably CLS_ACT is
-	 * compiled in */
 #ifndef CONFIG_NET_CLS_ACT
-#ifndef CONFIG_NETFILTER
-	printk("You MUST compile classifier actions into the kernel\n");
-	return -EINVAL;
-#else
+#ifdef CONFIG_NETFILTER
 	printk("Ingress scheduler: Classifier actions prefered over netfilter\n");
-#endif
-#endif
 
-#ifndef CONFIG_NET_CLS_ACT
-#ifdef CONFIG_NETFILTER
 	if (!nf_registered) {
 		if (nf_register_hooks(ing_ops, ARRAY_SIZE(ing_ops)) < 0) {
 			printk("ingress qdisc registration error \n");