Changeset 18900


Ignore:
Timestamp:
2009-12-23T09:12:15+01:00 (8 years ago)
Author:
nico
Message:

[target] generic: ESFQ patch, only include net/netfilter/nf_conntrack.h when CONFIG_NET_SCH_ESFQ_NFCT is set (fixes build failure on target where CONFIG_NETFILTER is not set)

Location:
trunk/target/linux/generic-2.6
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch

    r13137 r18900  
    9191--- /dev/null 
    9292+++ b/net/sched/sch_esfq.c 
    93 @@ -0,0 +1,702 @@ 
     93@@ -0,0 +1,704 @@ 
    9494+/* 
    9595+ * net/sched/sch_esfq.c        Extended Stochastic Fairness Queueing discipline. 
     
    144144+#include <net/pkt_sched.h> 
    145145+#include <linux/jhash.h> 
     146+#ifdef CONFIG_NET_SCH_ESFQ_NFCT 
    146147+#include <net/netfilter/nf_conntrack.h> 
     148+#endif 
    147149+ 
    148150+/*     Stochastic Fairness Queuing algorithm. 
  • trunk/target/linux/generic-2.6/patches-2.6.28/200-sched_esfq.patch

    r13546 r18900  
    9191--- /dev/null 
    9292+++ b/net/sched/sch_esfq.c 
    93 @@ -0,0 +1,702 @@ 
     93@@ -0,0 +1,704 @@ 
    9494+/* 
    9595+ * net/sched/sch_esfq.c        Extended Stochastic Fairness Queueing discipline. 
     
    144144+#include <net/pkt_sched.h> 
    145145+#include <linux/jhash.h> 
     146+#ifdef CONFIG_NET_SCH_ESFQ_NFCT 
    146147+#include <net/netfilter/nf_conntrack.h> 
     148+#endif 
    147149+ 
    148150+/*     Stochastic Fairness Queuing algorithm. 
  • trunk/target/linux/generic-2.6/patches-2.6.30/200-sched_esfq.patch

    r15803 r18900  
    9191--- /dev/null 
    9292+++ b/net/sched/sch_esfq.c 
    93 @@ -0,0 +1,700 @@ 
     93@@ -0,0 +1,702 @@ 
    9494+/* 
    9595+ * net/sched/sch_esfq.c        Extended Stochastic Fairness Queueing discipline. 
     
    145145+#include <net/pkt_sched.h> 
    146146+#include <linux/jhash.h> 
     147+#ifdef CONFIG_NET_SCH_ESFQ_NFCT 
    147148+#include <net/netfilter/nf_conntrack.h> 
     149+#endif 
    148150+ 
    149151+/*     Stochastic Fairness Queuing algorithm. 
  • trunk/target/linux/generic-2.6/patches-2.6.31/200-sched_esfq.patch

    r17752 r18900  
    9191--- /dev/null 
    9292+++ b/net/sched/sch_esfq.c 
    93 @@ -0,0 +1,700 @@ 
     93@@ -0,0 +1,702 @@ 
    9494+/* 
    9595+ * net/sched/sch_esfq.c        Extended Stochastic Fairness Queueing discipline. 
     
    145145+#include <net/pkt_sched.h> 
    146146+#include <linux/jhash.h> 
     147+#ifdef CONFIG_NET_SCH_ESFQ_NFCT 
    147148+#include <net/netfilter/nf_conntrack.h> 
     149+#endif 
    148150+ 
    149151+/*     Stochastic Fairness Queuing algorithm. 
  • trunk/target/linux/generic-2.6/patches-2.6.32/200-sched_esfq.patch

    r17752 r18900  
    9191--- /dev/null 
    9292+++ b/net/sched/sch_esfq.c 
    93 @@ -0,0 +1,700 @@ 
     93@@ -0,0 +1,702 @@ 
    9494+/* 
    9595+ * net/sched/sch_esfq.c        Extended Stochastic Fairness Queueing discipline. 
     
    145145+#include <net/pkt_sched.h> 
    146146+#include <linux/jhash.h> 
     147+#ifdef CONFIG_NET_SCH_ESFQ_NFCT 
    147148+#include <net/netfilter/nf_conntrack.h> 
     149+#endif 
    148150+ 
    149151+/*     Stochastic Fairness Queuing algorithm. 
Note: See TracChangeset for help on using the changeset viewer.