diff options
Diffstat (limited to 'include/linux/tcp.h')
| -rw-r--r-- | include/linux/tcp.h | 51 | 
1 files changed, 0 insertions, 51 deletions
| diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 421c99c12291..4f8159e90ce1 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -78,47 +78,6 @@ struct tcp_sack_block {  #define TCP_SACK_SEEN     (1 << 0)   /*1 = peer is SACK capable, */  #define TCP_DSACK_SEEN    (1 << 2)   /*1 = DSACK was received from peer*/ -#if IS_ENABLED(CONFIG_MPTCP) -struct mptcp_options_received { -	u64	sndr_key; -	u64	rcvr_key; -	u64	data_ack; -	u64	data_seq; -	u32	subflow_seq; -	u16	data_len; -	u16	mp_capable : 1, -		mp_join : 1, -		dss : 1, -		add_addr : 1, -		rm_addr : 1, -		family : 4, -		echo : 1, -		backup : 1; -	u32	token; -	u32	nonce; -	u64	thmac; -	u8	hmac[20]; -	u8	join_id; -	u8	use_map:1, -		dsn64:1, -		data_fin:1, -		use_ack:1, -		ack64:1, -		mpc_map:1, -		__unused:2; -	u8	addr_id; -	u8	rm_id; -	union { -		struct in_addr	addr; -#if IS_ENABLED(CONFIG_MPTCP_IPV6) -		struct in6_addr	addr6; -#endif -	}; -	u64	ahmac; -	u16	port; -}; -#endif -  struct tcp_options_received {  /*	PAWS/RTTM data	*/  	int	ts_recent_stamp;/* Time we stored ts_recent (for aging) */ @@ -136,9 +95,6 @@ struct tcp_options_received {  	u8	num_sacks;	/* Number of SACK blocks		*/  	u16	user_mss;	/* mss requested by user in ioctl	*/  	u16	mss_clamp;	/* Maximal mss, negotiated at connection setup */ -#if IS_ENABLED(CONFIG_MPTCP) -	struct mptcp_options_received	mptcp; -#endif  };  static inline void tcp_clear_options(struct tcp_options_received *rx_opt) @@ -148,13 +104,6 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt)  #if IS_ENABLED(CONFIG_SMC)  	rx_opt->smc_ok = 0;  #endif -#if IS_ENABLED(CONFIG_MPTCP) -	rx_opt->mptcp.mp_capable = 0; -	rx_opt->mptcp.mp_join = 0; -	rx_opt->mptcp.add_addr = 0; -	rx_opt->mptcp.rm_addr = 0; -	rx_opt->mptcp.dss = 0; -#endif  }  /* This is the max number of SACKS that we'll generate and process. It's safe |