Commit 2dedab6f authored by Tom Parkin's avatar Tom Parkin Committed by David S. Miller
Browse files

l2tp: remove build_header callback in struct l2tp_session 



The structure of an L2TP data packet header varies depending on the
version of the L2TP protocol being used.

struct l2tp_session used to have a build_header callback to abstract
this difference away.  It's clearer to simply choose the correct
function to use when building the data packet (and we save on the
function pointer in the session structure).

This approach does mean dereferencing the parent tunnel structure in
order to determine the tunnel version, but we're doing that in the
transmit path in any case.

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

net/l2tp/l2tp_core.c

+4 −6
Original line number Diff line number Diff line
@@ -1116,7 +1116,10 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len 
	}



	/* Setup L2TP header */

	session->build_header(session, __skb_push(skb, hdr_len));

	if (tunnel->version == L2TP_HDR_VER_2)

		l2tp_build_l2tpv2_header(session, __skb_push(skb, hdr_len));

	else

		l2tp_build_l2tpv3_header(session, __skb_push(skb, hdr_len));



	/* Reset skb netfilter state */

	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
@@ -1700,11 +1703,6 @@ struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunn 
			memcpy(&session->peer_cookie[0], &cfg->peer_cookie[0], cfg->peer_cookie_len);

		}



		if (tunnel->version == L2TP_HDR_VER_2)

			session->build_header = l2tp_build_l2tpv2_header;

		else

			session->build_header = l2tp_build_l2tpv3_header;



		l2tp_session_set_header_len(session, tunnel->version);



		refcount_set(&session->ref_count, 1);

net/l2tp/l2tp_core.h

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ struct l2tp_session { 
	struct l2tp_stats	stats;

	struct hlist_node	global_hlist;	/* global hash list node */



	int (*build_header)(struct l2tp_session *session, void *buf);

	void (*recv_skb)(struct l2tp_session *session, struct sk_buff *skb, int data_len);

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

	void (*show)(struct seq_file *m, void *priv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE