Commit d39dceca authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

mptcp: add __init annotation on setup functions 



Add the missing annotation in some setup-only
functions.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent be7aa9fa

net/mptcp/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ void mptcp_pm_close(struct mptcp_sock *msk) 
		sock_put((struct sock *)msk);

}



void mptcp_pm_init(void)

void __init mptcp_pm_init(void)

{

	pm_wq = alloc_workqueue("pm_wq", WQ_UNBOUND | WQ_MEM_RECLAIM, 8);

	if (!pm_wq)

net/mptcp/pm_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ static struct pernet_operations mptcp_pm_pernet_ops = { 
	.size = sizeof(struct pm_nl_pernet),

};



void mptcp_pm_nl_init(void)

void __init mptcp_pm_nl_init(void)

{

	if (register_pernet_subsys(&mptcp_pm_pernet_ops) < 0)

		panic("Failed to register MPTCP PM pernet subsystem.\n");

net/mptcp/protocol.c

+2 −2
Original line number Diff line number Diff line
@@ -2077,7 +2077,7 @@ static struct inet_protosw mptcp_protosw = { 
	.flags		= INET_PROTOSW_ICSK,

};



void mptcp_proto_init(void)

void __init mptcp_proto_init(void)

{

	mptcp_prot.h.hashinfo = tcp_prot.h.hashinfo;
@@ -2139,7 +2139,7 @@ static struct inet_protosw mptcp_v6_protosw = { 
	.flags		= INET_PROTOSW_ICSK,

};



int mptcp_proto_v6_init(void)

int __init mptcp_proto_v6_init(void)

{

	int err;

net/mptcp/protocol.h

+5 −5
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ mptcp_subflow_get_mapped_dsn(const struct mptcp_subflow_context *subflow) 


int mptcp_is_enabled(struct net *net);

bool mptcp_subflow_data_available(struct sock *sk);

void mptcp_subflow_init(void);

void __init mptcp_subflow_init(void);



/* called with sk socket lock held */

int __mptcp_subflow_connect(struct sock *sk, int ifindex,
@@ -355,9 +355,9 @@ static inline void mptcp_subflow_tcp_fallback(struct sock *sk, 
	inet_csk(sk)->icsk_af_ops = ctx->icsk_af_ops;

}



void mptcp_proto_init(void);

void __init mptcp_proto_init(void);

#if IS_ENABLED(CONFIG_MPTCP_IPV6)

int mptcp_proto_v6_init(void);

int __init mptcp_proto_v6_init(void);

#endif



struct sock *mptcp_sk_clone(const struct sock *sk,
@@ -394,7 +394,7 @@ static inline void mptcp_crypto_key_gen_sha(u64 *key, u32 *token, u64 *idsn) 


void mptcp_crypto_hmac_sha(u64 key1, u64 key2, u8 *msg, int len, void *hmac);



void mptcp_pm_init(void);

void __init mptcp_pm_init(void);

void mptcp_pm_data_init(struct mptcp_sock *msk);

void mptcp_pm_close(struct mptcp_sock *msk);

void mptcp_pm_new_connection(struct mptcp_sock *msk, int server_side);
@@ -428,7 +428,7 @@ bool mptcp_pm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, 
			  struct mptcp_addr_info *saddr);

int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);



void mptcp_pm_nl_init(void);

void __init mptcp_pm_nl_init(void);

void mptcp_pm_nl_data_init(struct mptcp_sock *msk);

void mptcp_pm_nl_fully_established(struct mptcp_sock *msk);

void mptcp_pm_nl_subflow_established(struct mptcp_sock *msk);

net/mptcp/subflow.c

+1 −1
Original line number Diff line number Diff line
@@ -1255,7 +1255,7 @@ static int subflow_ops_init(struct request_sock_ops *subflow_ops) 
	return 0;

}



void mptcp_subflow_init(void)

void __init mptcp_subflow_init(void)

{

	subflow_request_sock_ops = tcp_request_sock_ops;

	if (subflow_ops_init(&subflow_request_sock_ops) != 0)