Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92ea4a7e authored by Guillaume Nault's avatar Guillaume Nault Committed by David S. Miller
Browse files

l2tp: drop ->mru from struct l2tp_session 



This field is not used.

Treat PPPIOC*MRU the same way as PPPIOC*FLAGS: "get" requests return 0,
while "set" requests vadidate the user supplied pointer but discard its
value.

Signed-off-by: default avatarGuillaume Nault <g.nault@alphalink.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1998b5ed

include/uapi/linux/l2tp.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

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 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ struct l2tp_session_cfg { 
	int			reorder_timeout; /* configured reorder timeout

						  * (in jiffies) */

	int			mtu;

	int			mru;

	char			*ifname;

};
@@ -107,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 −2
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ 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 %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->lns_mode ? "LNS" : "LAC",

net/l2tp/l2tp_netlink.c

+1 −9
Original line number Diff line number Diff line
@@ -611,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();
@@ -704,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);
@@ -737,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] &&