diff options
| -rw-r--r-- | include/net/tc_act/tc_gact.h | 2 | ||||
| -rw-r--r-- | include/net/tc_act/tc_mirred.h | 2 | ||||
| -rw-r--r-- | net/sched/act_api.c | 3 | ||||
| -rw-r--r-- | net/sched/cls_api.c | 1 | ||||
| -rw-r--r-- | net/sched/cls_fw.c | 3 | ||||
| -rw-r--r-- | net/sched/cls_route.c | 3 | ||||
| -rw-r--r-- | net/sched/cls_rsvp.c | 3 | ||||
| -rw-r--r-- | net/sched/cls_rsvp6.c | 3 | ||||
| -rw-r--r-- | net/sched/cls_tcindex.c | 3 | ||||
| -rw-r--r-- | net/sched/cls_u32.c | 3 | ||||
| -rw-r--r-- | net/sched/police.c | 2 |
11 files changed, 18 insertions, 10 deletions
diff --git a/include/net/tc_act/tc_gact.h b/include/net/tc_act/tc_gact.h index 8401ce1913a8..59f0d9628ad1 100644 --- a/include/net/tc_act/tc_gact.h +++ b/include/net/tc_act/tc_gact.h @@ -1,7 +1,7 @@ #ifndef __NET_TC_GACT_H #define __NET_TC_GACT_H -#include <net/pkt_sched.h> +#include <net/act_api.h> struct tcf_gact { diff --git a/include/net/tc_act/tc_mirred.h b/include/net/tc_act/tc_mirred.h index f7f9b76c2511..b5c32f65c12c 100644 --- a/include/net/tc_act/tc_mirred.h +++ b/include/net/tc_act/tc_mirred.h @@ -1,7 +1,7 @@ #ifndef __NET_TC_MIR_H #define __NET_TC_MIR_H -#include <net/pkt_sched.h> +#include <net/act_api.h> struct tcf_mirred { diff --git a/net/sched/act_api.c b/net/sched/act_api.c index a1243f0c062e..12757e2b76eb 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c @@ -31,7 +31,8 @@ #include <linux/init.h> #include <linux/kmod.h> #include <net/sock.h> -#include <net/pkt_sched.h> +#include <net/sch_generic.h> +#include <net/act_api.h> #if 1 /* control */ #define DPRINTK(format,args...) printk(KERN_DEBUG format,##args) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 2a65efebcadc..9a84d34de2e4 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -36,6 +36,7 @@ #include <linux/kmod.h> #include <net/sock.h> #include <net/pkt_sched.h> +#include <net/pkt_cls.h> #if 0 /* control */ #define DPRINTK(format,args...) printk(KERN_DEBUG format,##args) diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c index 4d8438a59e1f..7bb75eb1ee32 100644 --- a/net/sched/cls_fw.c +++ b/net/sched/cls_fw.c @@ -43,7 +43,8 @@ #include <net/route.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <net/pkt_sched.h> +#include <net/act_api.h> +#include <net/pkt_cls.h> struct fw_head { diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index 0762c74ae574..a39e85264276 100644 --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c @@ -33,7 +33,8 @@ #include <net/route.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <net/pkt_sched.h> +#include <net/act_api.h> +#include <net/pkt_cls.h> /* 1. For now we assume that route tags < 256. diff --git a/net/sched/cls_rsvp.c b/net/sched/cls_rsvp.c index 69a56e921171..ad2613790d85 100644 --- a/net/sched/cls_rsvp.c +++ b/net/sched/cls_rsvp.c @@ -32,7 +32,8 @@ #include <net/route.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <net/pkt_sched.h> +#include <net/act_api.h> +#include <net/pkt_cls.h> #define RSVP_DST_LEN 1 #define RSVP_ID "rsvp" diff --git a/net/sched/cls_rsvp6.c b/net/sched/cls_rsvp6.c index 9a0dac539f78..fde51f7848eb 100644 --- a/net/sched/cls_rsvp6.c +++ b/net/sched/cls_rsvp6.c @@ -33,7 +33,8 @@ #include <net/route.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <net/pkt_sched.h> +#include <net/act_api.h> +#include <net/pkt_cls.h> #define RSVP_DST_LEN 4 #define RSVP_ID "rsvp6" diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c index c696fcf8f166..f8c58fb573ce 100644 --- a/net/sched/cls_tcindex.c +++ b/net/sched/cls_tcindex.c @@ -12,7 +12,8 @@ #include <linux/errno.h> #include <linux/netdevice.h> #include <net/ip.h> -#include <net/pkt_sched.h> +#include <net/act_api.h> +#include <net/pkt_cls.h> #include <net/route.h> diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index 3e0a1db55460..c8e11345f308 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c @@ -54,7 +54,8 @@ #include <net/route.h> #include <linux/skbuff.h> #include <net/sock.h> -#include <net/pkt_sched.h> +#include <net/act_api.h> +#include <net/pkt_cls.h> struct tc_u_knode diff --git a/net/sched/police.c b/net/sched/police.c index cb30e8ea9fef..74bfb0325f62 100644 --- a/net/sched/police.c +++ b/net/sched/police.c @@ -31,7 +31,7 @@ #include <linux/rtnetlink.h> #include <linux/init.h> #include <net/sock.h> -#include <net/pkt_sched.h> +#include <net/act_api.h> #define L2T(p,L) ((p)->R_tab->data[(L)>>(p)->R_tab->rate.cell_log]) #define L2T_P(p,L) ((p)->P_tab->data[(L)>>(p)->P_tab->rate.cell_log]) |