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

Commit 57ceb861 authored by Asbjørn Sloth Tønnesen's avatar Asbjørn Sloth Tønnesen Committed by David S. Miller
Browse files

net: l2tp: cleanup: remove redundant condition 



These assignments follow this pattern:

	unsigned int foo:1;
	struct nlattr *nla = info->attrs[bar];

	if (nla)
		foo = nla_get_flag(nla); /* expands to: foo = !!nla */

This could be simplified to: if (nla) foo = 1;
but lets just remove the condition and use the macro,

	foo = nla_get_flag(nla);

Signed-off-by: default avatarAsbjoern Sloth Toennesen <asbjorn@asbjorn.st>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97b7af09

net/l2tp/l2tp_netlink.c

+6 −6
Original line number Diff line number Diff line
@@ -220,14 +220,14 @@ static int l2tp_nl_cmd_tunnel_create(struct sk_buff *skb, struct genl_info *info 
			cfg.local_udp_port = nla_get_u16(info->attrs[L2TP_ATTR_UDP_SPORT]);

		if (info->attrs[L2TP_ATTR_UDP_DPORT])

			cfg.peer_udp_port = nla_get_u16(info->attrs[L2TP_ATTR_UDP_DPORT]);

		if (info->attrs[L2TP_ATTR_UDP_CSUM])

			cfg.use_udp_checksums = nla_get_flag(info->attrs[L2TP_ATTR_UDP_CSUM]);

		cfg.use_udp_checksums = nla_get_flag(

			info->attrs[L2TP_ATTR_UDP_CSUM]);



#if IS_ENABLED(CONFIG_IPV6)

		if (info->attrs[L2TP_ATTR_UDP_ZERO_CSUM6_TX])

			cfg.udp6_zero_tx_checksums = nla_get_flag(info->attrs[L2TP_ATTR_UDP_ZERO_CSUM6_TX]);

		if (info->attrs[L2TP_ATTR_UDP_ZERO_CSUM6_RX])

			cfg.udp6_zero_rx_checksums = nla_get_flag(info->attrs[L2TP_ATTR_UDP_ZERO_CSUM6_RX]);

		cfg.udp6_zero_tx_checksums = nla_get_flag(

			info->attrs[L2TP_ATTR_UDP_ZERO_CSUM6_TX]);

		cfg.udp6_zero_rx_checksums = nla_get_flag(

			info->attrs[L2TP_ATTR_UDP_ZERO_CSUM6_RX]);

#endif

	}