diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-03-29 02:14:21 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-03-29 02:14:21 -0400 |
| commit | 38064d3ea62efe0dd15b50fcec321ff75034e0d2 (patch) | |
| tree | 6d01707406d990f0e28b2adf8259f396bf68f0c4 /include | |
| parent | 2eff4c0d3ace5adee06d780e150d046e3712b2ec (diff) | |
| parent | 555a5d61f1623a0fa7aa012be0c4b24873c17991 (diff) | |
Merge tag 'v3.0.71' into v3.0-rt
This is the 3.0.71 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/binfmts.h | 2 | ||||
| -rw-r--r-- | include/net/inet_frag.h | 9 | ||||
| -rw-r--r-- | include/net/ip_fib.h | 12 |
3 files changed, 14 insertions, 9 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index 384e37f6834f..718eb0bca6fc 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -67,8 +67,6 @@ struct linux_binprm { #define BINPRM_FLAGS_EXECFD_BIT 1 #define BINPRM_FLAGS_EXECFD (1 << BINPRM_FLAGS_EXECFD_BIT) -#define BINPRM_MAX_RECURSION 4 - /* Function parameter for binfmt->coredump */ struct coredump_params { long signr; diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index 16ff29a7bb30..b289bd286d77 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h @@ -33,6 +33,13 @@ struct inet_frag_queue { #define INETFRAGS_HASHSZ 64 +/* averaged: + * max_depth = default ipfrag_high_thresh / INETFRAGS_HASHSZ / + * rounded up (SKB_TRUELEN(0) + sizeof(struct ipq or + * struct frag_queue)) + */ +#define INETFRAGS_MAXDEPTH 128 + struct inet_frags { struct hlist_head hash[INETFRAGS_HASHSZ]; rwlock_t lock; @@ -64,6 +71,8 @@ int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f); struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, struct inet_frags *f, void *key, unsigned int hash) __releases(&f->lock); +void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q, + const char *prefix); static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f) { diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 10422ef14e28..2124004da62f 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -129,18 +129,16 @@ struct fib_result_nl { }; #ifdef CONFIG_IP_ROUTE_MULTIPATH - #define FIB_RES_NH(res) ((res).fi->fib_nh[(res).nh_sel]) - -#define FIB_TABLE_HASHSZ 2 - #else /* CONFIG_IP_ROUTE_MULTIPATH */ - #define FIB_RES_NH(res) ((res).fi->fib_nh[0]) +#endif /* CONFIG_IP_ROUTE_MULTIPATH */ +#ifdef CONFIG_IP_MULTIPLE_TABLES #define FIB_TABLE_HASHSZ 256 - -#endif /* CONFIG_IP_ROUTE_MULTIPATH */ +#else +#define FIB_TABLE_HASHSZ 2 +#endif extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh); |