tunnels: Don't require remote endpoint or ID during creation. (e277de5f) · Commits · 戴 / test

Before lightweight tunnels existed, it really didn't make sense to create a tunnel that was not fully specified, such as without a destination IP address - the resulting packets would go nowhere. However, with lightweight tunnels, the opposite is true - it doesn't make sense to require this information when it will be provided later on by the route. This loosens the requirements for this information. An alternative would be to allow the relaxed version only when COLLECT_METADATA is enabled. However, since there are several variations on this theme (such as NBMA tunnels in GRE), just dropping the restrictions seems the most consistent across tunnels and with the existing configuration. CC: John Linville <linville@tuxdriver.com> Signed-off-by:

Jesse Gross <jesse@nicira.com> Signed-off-by:

Thomas Graf <tgraf@suug.ch> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/geneve.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -870,13 +870,13 @@ static int geneve_newlink(struct net net, struct net_device dev,
	__be16 dst_port = htons(GENEVE_UDP_PORT);		__be16 dst_port = htons(GENEVE_UDP_PORT);
	__u8 ttl = 0, tos = 0;		__u8 ttl = 0, tos = 0;
	bool metadata = false;		bool metadata = false;
	__be32 rem_addr;		__be32 rem_addr = 0;
	__u32 vni;		__u32 vni = 0;

	if (!data[IFLA_GENEVE_ID] \|\| !data[IFLA_GENEVE_REMOTE])
	return -EINVAL;

			if (data[IFLA_GENEVE_ID])
	vni = nla_get_u32(data[IFLA_GENEVE_ID]);		vni = nla_get_u32(data[IFLA_GENEVE_ID]);

			if (data[IFLA_GENEVE_REMOTE])
	rem_addr = nla_get_in_addr(data[IFLA_GENEVE_REMOTE]);		rem_addr = nla_get_in_addr(data[IFLA_GENEVE_REMOTE]);

	if (data[IFLA_GENEVE_TTL])		if (data[IFLA_GENEVE_TTL])

drivers/net/vxlan.c

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2745,10 +2745,9 @@ static int vxlan_newlink(struct net src_net, struct net_device dev,
	struct vxlan_config conf;		struct vxlan_config conf;
	int err;		int err;

	if (!data[IFLA_VXLAN_ID])
	return -EINVAL;

	memset(&conf, 0, sizeof(conf));		memset(&conf, 0, sizeof(conf));

			if (data[IFLA_VXLAN_ID])
	conf.vni = nla_get_u32(data[IFLA_VXLAN_ID]);		conf.vni = nla_get_u32(data[IFLA_VXLAN_ID]);

	if (data[IFLA_VXLAN_GROUP]) {		if (data[IFLA_VXLAN_GROUP]) {

Admin message