Commit 628703f5 authored by Tom Parkin's avatar Tom Parkin Committed by David S. Miller
Browse files

l2tp: return void from l2tp_session_delete 



l2tp_session_delete is used to schedule a session instance for deletion.
The function itself always returns zero, and none of its direct callers
check its return value, so have the function return void.

This change de-facto changes the l2tp netlink session_delete callback
prototype since all pseudowires currently use l2tp_session_delete for
their implementation of that operation.

Signed-off-by: default avatarTom Parkin <tparkin@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 52016e25

net/l2tp/l2tp_core.c

+2 −7
Original line number Diff line number Diff line
@@ -1620,13 +1620,10 @@ void l2tp_tunnel_delete(struct l2tp_tunnel *tunnel) 
}

EXPORT_SYMBOL_GPL(l2tp_tunnel_delete);



/* This function is used by the netlink SESSION_DELETE command and by

 * pseudowire modules.

 */

int l2tp_session_delete(struct l2tp_session *session)

void l2tp_session_delete(struct l2tp_session *session)

{

	if (test_and_set_bit(0, &session->dead))

		return 0;

		return;



	l2tp_session_unhash(session);

	l2tp_session_queue_purge(session);
@@ -1634,8 +1631,6 @@ int l2tp_session_delete(struct l2tp_session *session) 
		(*session->session_close)(session);



	l2tp_session_dec_refcount(session);



	return 0;

}

EXPORT_SYMBOL_GPL(l2tp_session_delete);

net/l2tp/l2tp_core.h

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct l2tp_nl_cmd_ops { 
	int (*session_create)(struct net *net, struct l2tp_tunnel *tunnel,

			      u32 session_id, u32 peer_session_id,

			      struct l2tp_session_cfg *cfg);

	int (*session_delete)(struct l2tp_session *session);

	void (*session_delete)(struct l2tp_session *session);

};



static inline void *l2tp_session_priv(struct l2tp_session *session)
@@ -204,7 +204,7 @@ struct l2tp_session *l2tp_session_create(int priv_size, 
int l2tp_session_register(struct l2tp_session *session,

			  struct l2tp_tunnel *tunnel);



int l2tp_session_delete(struct l2tp_session *session);

void l2tp_session_delete(struct l2tp_session *session);

void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,

		      unsigned char *ptr, unsigned char *optr, u16 hdrflags,

		      int length);

net/l2tp/l2tp_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static int l2tp_nl_cmd_session_delete(struct sk_buff *skb, struct genl_info *inf 
	pw_type = session->pwtype;

	if (pw_type < __L2TP_PWTYPE_MAX)

		if (l2tp_nl_cmd_ops[pw_type] && l2tp_nl_cmd_ops[pw_type]->session_delete)

			ret = (*l2tp_nl_cmd_ops[pw_type]->session_delete)(session);

			l2tp_nl_cmd_ops[pw_type]->session_delete(session);



	l2tp_session_dec_refcount(session);

CRA Git | Maintained and supported by SUSTech CRA and CCSE