aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/net/inet_frag.h4
-rw-r--r--include/net/ip.h2
-rw-r--r--include/net/ipv6.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 8ab6df64a12a..d36f3a6e6d4e 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -2,6 +2,7 @@
2#define __NET_FRAG_H__ 2#define __NET_FRAG_H__
3 3
4struct netns_frags { 4struct netns_frags {
5 int nqueues;
5}; 6};
6 7
7struct inet_frag_queue { 8struct inet_frag_queue {
@@ -36,7 +37,6 @@ struct inet_frags {
36 struct hlist_head hash[INETFRAGS_HASHSZ]; 37 struct hlist_head hash[INETFRAGS_HASHSZ];
37 rwlock_t lock; 38 rwlock_t lock;
38 u32 rnd; 39 u32 rnd;
39 int nqueues;
40 int qsize; 40 int qsize;
41 atomic_t mem; 41 atomic_t mem;
42 struct timer_list secret_timer; 42 struct timer_list secret_timer;
@@ -55,6 +55,8 @@ struct inet_frags {
55void inet_frags_init(struct inet_frags *); 55void inet_frags_init(struct inet_frags *);
56void inet_frags_fini(struct inet_frags *); 56void inet_frags_fini(struct inet_frags *);
57 57
58void inet_frags_init_net(struct netns_frags *nf);
59
58void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f); 60void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f);
59void inet_frag_destroy(struct inet_frag_queue *q, 61void inet_frag_destroy(struct inet_frag_queue *q,
60 struct inet_frags *f, int *work); 62 struct inet_frags *f, int *work);
diff --git a/include/net/ip.h b/include/net/ip.h
index 9d43ac222d15..fbe28308bf73 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -332,7 +332,7 @@ enum ip_defrag_users
332 332
333int ip_defrag(struct sk_buff *skb, u32 user); 333int ip_defrag(struct sk_buff *skb, u32 user);
334int ip_frag_mem(void); 334int ip_frag_mem(void);
335int ip_frag_nqueues(void); 335int ip_frag_nqueues(struct net *net);
336 336
337/* 337/*
338 * Functions provided by ip_forward.c 338 * Functions provided by ip_forward.c
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 87ca1bf17d71..da1c089680d8 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -245,7 +245,7 @@ struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
245 245
246extern int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb); 246extern int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb);
247 247
248int ip6_frag_nqueues(void); 248int ip6_frag_nqueues(struct net *net);
249int ip6_frag_mem(void); 249int ip6_frag_mem(void);
250 250
251#define IPV6_FRAG_TIMEOUT (60*HZ) /* 60 seconds */ 251#define IPV6_FRAG_TIMEOUT (60*HZ) /* 60 seconds */