Commit 1d4b016f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'l2tp-remove-unused-session-fields' 



Guillaume Nault says:

====================
l2tp: remove unused session fields

Several fields of the session structures can be set, but remain unused
otherwise.

This series removes these fields and explicitely ignores the
associated ioctls and netlink attributes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3e4e3643 92ea4a7e

include/uapi/linux/l2tp.h

+7 −6
Original line number Diff line number Diff line
@@ -60,14 +60,14 @@ struct sockaddr_l2tpip6 { 
/*

 * Commands.

 * Valid TLVs of each command are:-

 * TUNNEL_CREATE	- CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum, vlanid

 * TUNNEL_CREATE	- CONN_ID, pw_type, netns, ifname, ipinfo, udpinfo, udpcsum

 * TUNNEL_DELETE	- CONN_ID

 * TUNNEL_MODIFY	- CONN_ID, udpcsum

 * TUNNEL_GETSTATS	- CONN_ID, (stats)

 * TUNNEL_GET		- CONN_ID, (...)

 * SESSION_CREATE	- SESSION_ID, PW_TYPE, data_seq, cookie, peer_cookie, l2spec

 * SESSION_CREATE	- SESSION_ID, PW_TYPE, cookie, peer_cookie, l2spec

 * SESSION_DELETE	- SESSION_ID

 * SESSION_MODIFY	- SESSION_ID, data_seq

 * SESSION_MODIFY	- SESSION_ID

 * SESSION_GET		- SESSION_ID, (...)

 * SESSION_GETSTATS	- SESSION_ID, (stats)

 *
@@ -95,7 +95,7 @@ enum { 
	L2TP_ATTR_PW_TYPE,		/* u16, enum l2tp_pwtype */

	L2TP_ATTR_ENCAP_TYPE,		/* u16, enum l2tp_encap_type */

	L2TP_ATTR_OFFSET,		/* u16 (not used) */

	L2TP_ATTR_DATA_SEQ,		/* u16 */

	L2TP_ATTR_DATA_SEQ,		/* u16 (not used) */

	L2TP_ATTR_L2SPEC_TYPE,		/* u8, enum l2tp_l2spec_type */

	L2TP_ATTR_L2SPEC_LEN,		/* u8 (not used) */

	L2TP_ATTR_PROTO_VERSION,	/* u8 */
@@ -105,7 +105,7 @@ enum { 
	L2TP_ATTR_SESSION_ID,		/* u32 */

	L2TP_ATTR_PEER_SESSION_ID,	/* u32 */

	L2TP_ATTR_UDP_CSUM,		/* u8 */

	L2TP_ATTR_VLAN_ID,		/* u16 */

	L2TP_ATTR_VLAN_ID,		/* u16 (not used) */

	L2TP_ATTR_COOKIE,		/* 0, 4 or 8 bytes */

	L2TP_ATTR_PEER_COOKIE,		/* 0, 4 or 8 bytes */

	L2TP_ATTR_DEBUG,		/* u32, enum l2tp_debug_flags */
@@ -120,7 +120,7 @@ enum { 
	L2TP_ATTR_UDP_SPORT,		/* u16 */

	L2TP_ATTR_UDP_DPORT,		/* u16 */

	L2TP_ATTR_MTU,			/* u16 */

	L2TP_ATTR_MRU,			/* u16 */

	L2TP_ATTR_MRU,			/* u16 (not used) */

	L2TP_ATTR_STATS,		/* nested */

	L2TP_ATTR_IP6_SADDR,		/* struct in6_addr */

	L2TP_ATTR_IP6_DADDR,		/* struct in6_addr */
@@ -169,6 +169,7 @@ enum l2tp_encap_type { 
	L2TP_ENCAPTYPE_IP,

};



/* For L2TP_ATTR_DATA_SEQ. Unused. */

enum l2tp_seqmode {

	L2TP_SEQ_NONE = 0,

	L2TP_SEQ_IP = 1,

net/l2tp/l2tp_core.c

+0 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,6 @@ struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunn 
			session->pwtype = cfg->pw_type;

			session->debug = cfg->debug;

			session->mtu = cfg->mtu;

			session->mru = cfg->mru;

			session->send_seq = cfg->send_seq;

			session->recv_seq = cfg->recv_seq;

			session->lns_mode = cfg->lns_mode;

net/l2tp/l2tp_core.h

+0 −11
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ struct l2tp_tunnel; 
 */

struct l2tp_session_cfg {

	enum l2tp_pwtype	pw_type;

	unsigned int		data_seq:2;	/* data sequencing level

						 * 0 => none, 1 => IP only,

						 * 2 => all

						 */

	unsigned int		recv_seq:1;	/* expect receive packets with

						 * sequence numbers? */

	unsigned int		send_seq:1;	/* send packets with sequence
@@ -58,7 +54,6 @@ struct l2tp_session_cfg { 
						 * control of LNS. */

	int			debug;		/* bitmask of debug message

						 * categories */

	u16			vlan_id;	/* VLAN pseudowire only */

	u16			l2specific_type; /* Layer 2 specific type */

	u8			cookie[8];	/* optional cookie */

	int			cookie_len;	/* 0, 4 or 8 bytes */
@@ -67,7 +62,6 @@ struct l2tp_session_cfg { 
	int			reorder_timeout; /* configured reorder timeout

						  * (in jiffies) */

	int			mtu;

	int			mru;

	char			*ifname;

};
@@ -99,10 +93,6 @@ struct l2tp_session { 


	char			name[32];	/* for logging */

	char			ifname[IFNAMSIZ];

	unsigned int		data_seq:2;	/* data sequencing level

						 * 0 => none, 1 => IP only,

						 * 2 => all

						 */

	unsigned int		recv_seq:1;	/* expect receive packets with

						 * sequence numbers? */

	unsigned int		send_seq:1;	/* send packets with sequence
@@ -116,7 +106,6 @@ struct l2tp_session { 
						  * (in jiffies) */

	int			reorder_skip;	/* set if skip to next nr */

	int			mtu;

	int			mru;

	enum l2tp_pwtype	pwtype;

	struct l2tp_stats	stats;

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

net/l2tp/l2tp_debugfs.c

+2 −4
Original line number Diff line number Diff line
@@ -191,12 +191,10 @@ static void l2tp_dfs_seq_session_show(struct seq_file *m, void *v) 
	if (session->send_seq || session->recv_seq)

		seq_printf(m, "   nr %hu, ns %hu\n", session->nr, session->ns);

	seq_printf(m, "   refcnt %d\n", refcount_read(&session->ref_count));

	seq_printf(m, "   config %d/%d/%c/%c/%s/%s %08x %u\n",

		   session->mtu, session->mru,

	seq_printf(m, "   config %d/0/%c/%c/-/%s %08x %u\n",

		   session->mtu,

		   session->recv_seq ? 'R' : '-',

		   session->send_seq ? 'S' : '-',

		   session->data_seq == 1 ? "IPSEQ" :

		   session->data_seq == 2 ? "DATASEQ" : "-",

		   session->lns_mode ? "LNS" : "LAC",

		   session->debug,

		   jiffies_to_msecs(session->reorder_timeout));

net/l2tp/l2tp_netlink.c

+1 −18
Original line number Diff line number Diff line
@@ -560,9 +560,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf 
	}



	if (tunnel->version > 2) {

		if (info->attrs[L2TP_ATTR_DATA_SEQ])

			cfg.data_seq = nla_get_u8(info->attrs[L2TP_ATTR_DATA_SEQ]);



		if (info->attrs[L2TP_ATTR_L2SPEC_TYPE]) {

			cfg.l2specific_type = nla_get_u8(info->attrs[L2TP_ATTR_L2SPEC_TYPE]);

			if (cfg.l2specific_type != L2TP_L2SPECTYPE_DEFAULT &&
@@ -594,9 +591,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf 
		}

		if (info->attrs[L2TP_ATTR_IFNAME])

			cfg.ifname = nla_data(info->attrs[L2TP_ATTR_IFNAME]);



		if (info->attrs[L2TP_ATTR_VLAN_ID])

			cfg.vlan_id = nla_get_u16(info->attrs[L2TP_ATTR_VLAN_ID]);

	}



	if (info->attrs[L2TP_ATTR_DEBUG])
@@ -617,9 +611,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf 
	if (info->attrs[L2TP_ATTR_MTU])

		cfg.mtu = nla_get_u16(info->attrs[L2TP_ATTR_MTU]);



	if (info->attrs[L2TP_ATTR_MRU])

		cfg.mru = nla_get_u16(info->attrs[L2TP_ATTR_MRU]);



#ifdef CONFIG_MODULES

	if (l2tp_nl_cmd_ops[cfg.pw_type] == NULL) {

		genl_unlock();
@@ -693,9 +684,6 @@ static int l2tp_nl_cmd_session_modify(struct sk_buff *skb, struct genl_info *inf 
	if (info->attrs[L2TP_ATTR_DEBUG])

		session->debug = nla_get_u32(info->attrs[L2TP_ATTR_DEBUG]);



	if (info->attrs[L2TP_ATTR_DATA_SEQ])

		session->data_seq = nla_get_u8(info->attrs[L2TP_ATTR_DATA_SEQ]);



	if (info->attrs[L2TP_ATTR_RECV_SEQ])

		session->recv_seq = nla_get_u8(info->attrs[L2TP_ATTR_RECV_SEQ]);
@@ -713,9 +701,6 @@ static int l2tp_nl_cmd_session_modify(struct sk_buff *skb, struct genl_info *inf 
	if (info->attrs[L2TP_ATTR_MTU])

		session->mtu = nla_get_u16(info->attrs[L2TP_ATTR_MTU]);



	if (info->attrs[L2TP_ATTR_MRU])

		session->mru = nla_get_u16(info->attrs[L2TP_ATTR_MRU]);



	ret = l2tp_session_notify(&l2tp_nl_family, info,

				  session, L2TP_CMD_SESSION_MODIFY);
@@ -746,9 +731,7 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl 
			session->peer_session_id) ||

	    nla_put_u32(skb, L2TP_ATTR_DEBUG, session->debug) ||

	    nla_put_u16(skb, L2TP_ATTR_PW_TYPE, session->pwtype) ||

	    nla_put_u16(skb, L2TP_ATTR_MTU, session->mtu) ||

	    (session->mru &&

	     nla_put_u16(skb, L2TP_ATTR_MRU, session->mru)))

	    nla_put_u16(skb, L2TP_ATTR_MTU, session->mtu))

		goto nla_put_failure;



	if ((session->ifname[0] &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE