Commit 752e9067 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: add csum_enabled in mptcp_sock 



This patch added a new member named csum_enabled in struct mptcp_sock,
used a dummy mptcp_is_checksum_enabled() helper to initialize it.

Also added a new member named mptcpi_csum_enabled in struct mptcp_info
to expose the csum_enabled flag.

Acked-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7f3863c

include/uapi/linux/mptcp.h

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ struct mptcp_info { 
	__u64	mptcpi_rcv_nxt;

	__u8	mptcpi_local_addr_used;

	__u8	mptcpi_local_addr_max;

	__u8	mptcpi_csum_enabled;

};



/*

net/mptcp/mptcp_diag.c

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ static void mptcp_diag_get_info(struct sock *sk, struct inet_diag_msg *r, 
	info->mptcpi_write_seq = READ_ONCE(msk->write_seq);

	info->mptcpi_snd_una = READ_ONCE(msk->snd_una);

	info->mptcpi_rcv_nxt = READ_ONCE(msk->ack_seq);

	info->mptcpi_csum_enabled = READ_ONCE(msk->csum_enabled);

	unlock_sock_fast(sk, slow);

}

net/mptcp/protocol.c

+1 −0
Original line number Diff line number Diff line
@@ -2453,6 +2453,7 @@ static int __mptcp_init_sock(struct sock *sk) 
	msk->ack_hint = NULL;

	msk->first = NULL;

	inet_csk(sk)->icsk_sync_mss = mptcp_sync_mss;

	WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk)));



	mptcp_pm_data_init(msk);

net/mptcp/protocol.h

+2 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ struct mptcp_sock { 
	bool		snd_data_fin_enable;

	bool		rcv_fastclose;

	bool		use_64bit_ack; /* Set when we received a 64-bit DSN */

	bool		csum_enabled;

	spinlock_t	join_list_lock;

	struct sock	*ack_hint;

	struct work_struct work;
@@ -525,6 +526,7 @@ static inline void mptcp_subflow_delegated_done(struct mptcp_subflow_context *su 


int mptcp_is_enabled(struct net *net);

unsigned int mptcp_get_add_addr_timeout(struct net *net);

static inline int mptcp_is_checksum_enabled(struct net *net) { return false; }

void mptcp_subflow_fully_established(struct mptcp_subflow_context *subflow,

				     struct mptcp_options_received *mp_opt);

bool mptcp_subflow_data_available(struct sock *sk);