Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f0772fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://github.com/davem330/net 

* git://github.com/davem330/net:
  tcp: fix validation of D-SACK
  tcp: fix build error if !CONFIG_SYN_COOKIES
parents 6bf3b0dc f779b2d6

include/net/tcp.h

+18 −1
Original line number Diff line number Diff line
@@ -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,

net/ipv4/tcp_input.c

+1 −1
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ static int tcp_is_sackblock_valid(struct tcp_sock *tp, int is_dsack, 
		return 0;



	/* ...Then it's D-SACK, and must reside below snd_una completely */

	if (!after(end_seq, tp->snd_una))

	if (after(end_seq, tp->snd_una))

		return 0;



	if (!before(start_seq, tp->undo_marker))