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

Commit 9d4927f0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ipv6-misc' 



Tariq Toukan says:

====================
net/ipv6 misc

This patchset contains two patches for net/ipv6.

Patch 1 is a trivial typo fix in documentation.
Patch 2 by Eran is a re-spin. It adds GRO support for IPv6 GRE tunnel,
this significantly improves performance in case GRO in native interface
is disabled.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents db0aeb31 0c1dd2a1

net/ipv6/exthdrs_core.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ EXPORT_SYMBOL_GPL(ipv6_find_tlv); 
 * if target < 0. "last header" is transport protocol header, ESP, or

 * "No next header".

 *

 * Note that *offset is used as input/output parameter. an if it is not zero,

 * Note that *offset is used as input/output parameter, and if it is not zero,

 * then it must be a valid offset to an inner IPv6 header. This can be used

 * to explore inner IPv6 header, eg. ICMPv6 error messages.

 *

net/ipv6/ip6_gre.c

+27 −10
Original line number Diff line number Diff line
@@ -1314,6 +1314,7 @@ static void ip6gre_dev_free(struct net_device *dev) 
{

	struct ip6_tnl *t = netdev_priv(dev);



	gro_cells_destroy(&t->gro_cells);

	dst_cache_destroy(&t->dst_cache);

	free_percpu(dev->tstats);

}
@@ -1381,11 +1382,12 @@ static int ip6gre_tunnel_init_common(struct net_device *dev) 
		return -ENOMEM;



	ret = dst_cache_init(&tunnel->dst_cache, GFP_KERNEL);

	if (ret) {

		free_percpu(dev->tstats);

		dev->tstats = NULL;

		return ret;

	}

	if (ret)

		goto cleanup_alloc_pcpu_stats;



	ret = gro_cells_init(&tunnel->gro_cells, dev);

	if (ret)

		goto cleanup_dst_cache_init;



	tunnel->tun_hlen = gre_calc_hlen(tunnel->parms.o_flags);

	tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen;
@@ -1405,6 +1407,13 @@ static int ip6gre_tunnel_init_common(struct net_device *dev) 
	ip6gre_tnl_init_features(dev);



	return 0;



cleanup_dst_cache_init:

	dst_cache_destroy(&tunnel->dst_cache);

cleanup_alloc_pcpu_stats:

	free_percpu(dev->tstats);

	dev->tstats = NULL;

	return ret;

}



static int ip6gre_tunnel_init(struct net_device *dev)
@@ -1751,11 +1760,12 @@ static int ip6erspan_tap_init(struct net_device *dev) 
		return -ENOMEM;



	ret = dst_cache_init(&tunnel->dst_cache, GFP_KERNEL);

	if (ret) {

		free_percpu(dev->tstats);

		dev->tstats = NULL;

		return ret;

	}

	if (ret)

		goto cleanup_alloc_pcpu_stats;



	ret = gro_cells_init(&tunnel->gro_cells, dev);

	if (ret)

		goto cleanup_dst_cache_init;



	tunnel->tun_hlen = 8;

	tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen +
@@ -1773,6 +1783,13 @@ static int ip6erspan_tap_init(struct net_device *dev) 
	ip6gre_tnl_link_config(tunnel, 1);



	return 0;



cleanup_dst_cache_init:

	dst_cache_destroy(&tunnel->dst_cache);

cleanup_alloc_pcpu_stats:

	free_percpu(dev->tstats);

	dev->tstats = NULL;

	return ret;

}



static const struct net_device_ops ip6erspan_netdev_ops = {