summaryrefslogtreecommitdiffstats
path: root/kernel/include/net/tc_act
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include/net/tc_act')
-rw-r--r--kernel/include/net/tc_act/tc_bpf.h2
-rw-r--r--kernel/include/net/tc_act/tc_connmark.h1
-rw-r--r--kernel/include/net/tc_act/tc_gact.h7
-rw-r--r--kernel/include/net/tc_act/tc_mirred.h2
4 files changed, 7 insertions, 5 deletions
diff --git a/kernel/include/net/tc_act/tc_bpf.h b/kernel/include/net/tc_act/tc_bpf.h
index a152e9858..958d69cfb 100644
--- a/kernel/include/net/tc_act/tc_bpf.h
+++ b/kernel/include/net/tc_act/tc_bpf.h
@@ -15,7 +15,7 @@
struct tcf_bpf {
struct tcf_common common;
- struct bpf_prog *filter;
+ struct bpf_prog __rcu *filter;
union {
u32 bpf_fd;
u16 bpf_num_ops;
diff --git a/kernel/include/net/tc_act/tc_connmark.h b/kernel/include/net/tc_act/tc_connmark.h
index 5c1104c2e..02caa4066 100644
--- a/kernel/include/net/tc_act/tc_connmark.h
+++ b/kernel/include/net/tc_act/tc_connmark.h
@@ -5,6 +5,7 @@
struct tcf_connmark_info {
struct tcf_common common;
+ struct net *net;
u16 zone;
};
diff --git a/kernel/include/net/tc_act/tc_gact.h b/kernel/include/net/tc_act/tc_gact.h
index 9fc9b5789..592a6bc02 100644
--- a/kernel/include/net/tc_act/tc_gact.h
+++ b/kernel/include/net/tc_act/tc_gact.h
@@ -6,9 +6,10 @@
struct tcf_gact {
struct tcf_common common;
#ifdef CONFIG_GACT_PROB
- u16 tcfg_ptype;
- u16 tcfg_pval;
- int tcfg_paction;
+ u16 tcfg_ptype;
+ u16 tcfg_pval;
+ int tcfg_paction;
+ atomic_t packets;
#endif
};
#define to_gact(a) \
diff --git a/kernel/include/net/tc_act/tc_mirred.h b/kernel/include/net/tc_act/tc_mirred.h
index 4dd77a1c1..dae96bae1 100644
--- a/kernel/include/net/tc_act/tc_mirred.h
+++ b/kernel/include/net/tc_act/tc_mirred.h
@@ -8,7 +8,7 @@ struct tcf_mirred {
int tcfm_eaction;
int tcfm_ifindex;
int tcfm_ok_push;
- struct net_device *tcfm_dev;
+ struct net_device __rcu *tcfm_dev;
struct list_head tcfm_list;
};
#define to_mirred(a) \