diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:30:55 +0200 | 
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:30:55 +0200 | 
| commit | 29ea35969b92a4be122a58c4aceea8c5e2c388d9 (patch) | |
| tree | 8285c0e98e7bb03868d390b58180e3cab876a8db /include/net/tcp.h | |
| parent | 112d17d6f75b93e1dcaec2e2232a411148b3bf71 (diff) | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
Merge branch 'imx/devel' into next/devel
Diffstat (limited to 'include/net/tcp.h')
| -rw-r--r-- | include/net/tcp.h | 22 | 
1 files changed, 21 insertions, 1 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 149a415d1e0a..acc620a4a45f 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -431,17 +431,34 @@ extern int tcp_disconnect(struct sock *sk, int flags);  extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS];  extern struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,   				    struct ip_options *opt); +#ifdef CONFIG_SYN_COOKIES  extern __u32 cookie_v4_init_sequence(struct sock *sk, struct sk_buff *skb,   				     __u16 *mss); +#else +static inline __u32 cookie_v4_init_sequence(struct sock *sk, +					    struct sk_buff *skb, +					    __u16 *mss) +{ +	return 0; +} +#endif  extern __u32 cookie_init_timestamp(struct request_sock *req);  extern bool cookie_check_timestamp(struct tcp_options_received *opt, bool *);  /* From net/ipv6/syncookies.c */  extern struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb); +#ifdef CONFIG_SYN_COOKIES  extern __u32 cookie_v6_init_sequence(struct sock *sk, struct sk_buff *skb,  				     __u16 *mss); - +#else +static inline __u32 cookie_v6_init_sequence(struct sock *sk, +					    struct sk_buff *skb, +					    __u16 *mss) +{ +	return 0; +} +#endif  /* tcp_output.c */  extern void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss, @@ -460,6 +477,9 @@ extern int tcp_write_wakeup(struct sock *);  extern void tcp_send_fin(struct sock *sk);  extern void tcp_send_active_reset(struct sock *sk, gfp_t priority);  extern int tcp_send_synack(struct sock *); +extern int tcp_syn_flood_action(struct sock *sk, +				const struct sk_buff *skb, +				const char *proto);  extern void tcp_push_one(struct sock *, unsigned int mss_now);  extern void tcp_send_ack(struct sock *sk);  extern void tcp_send_delayed_ack(struct sock *sk);  | 
