aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/Kbuild1
-rw-r--r--include/linux/tc_act/Kbuild1
-rw-r--r--include/linux/veth.h (renamed from include/net/veth.h)0
-rw-r--r--include/net/netfilter/nf_conntrack.h1
4 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 9abf5a806c15..f30fa92a44a1 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -153,6 +153,7 @@ header-y += toshiba.h
153header-y += ultrasound.h 153header-y += ultrasound.h
154header-y += un.h 154header-y += un.h
155header-y += utime.h 155header-y += utime.h
156header-y += veth.h
156header-y += video_decoder.h 157header-y += video_decoder.h
157header-y += video_encoder.h 158header-y += video_encoder.h
158header-y += videotext.h 159header-y += videotext.h
diff --git a/include/linux/tc_act/Kbuild b/include/linux/tc_act/Kbuild
index 78dfbac36375..6dac0d7365cc 100644
--- a/include/linux/tc_act/Kbuild
+++ b/include/linux/tc_act/Kbuild
@@ -2,3 +2,4 @@ header-y += tc_gact.h
2header-y += tc_ipt.h 2header-y += tc_ipt.h
3header-y += tc_mirred.h 3header-y += tc_mirred.h
4header-y += tc_pedit.h 4header-y += tc_pedit.h
5header-y += tc_nat.h
diff --git a/include/net/veth.h b/include/linux/veth.h
index 3354c1eb424e..3354c1eb424e 100644
--- a/include/net/veth.h
+++ b/include/linux/veth.h
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 90fb66d99d0c..4ac5ab187c2a 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -249,6 +249,7 @@ static inline int nf_ct_is_untracked(const struct sk_buff *skb)
249 return (skb->nfct == &nf_conntrack_untracked.ct_general); 249 return (skb->nfct == &nf_conntrack_untracked.ct_general);
250} 250}
251 251
252extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);
252extern unsigned int nf_conntrack_htable_size; 253extern unsigned int nf_conntrack_htable_size;
253extern int nf_conntrack_checksum; 254extern int nf_conntrack_checksum;
254extern atomic_t nf_conntrack_count; 255extern atomic_t nf_conntrack_count;