Commit 3f8a8447 authored by Matthias May's avatar Matthias May Committed by David S. Miller
Browse files

ip6_gre: use actual protocol to select xmit 



When the payload is a VLAN encapsulated IPv6/IPv6 frame, we can
skip the 802.1q/802.1ad ethertypes and jump to the actual protocol.
This way we treat IPv4/IPv6 frames as IP instead of as "other".

Signed-off-by: default avatarMatthias May <matthias.may@westermo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41337f52

net/ipv6/ip6_gre.c

+3 −1
Original line number Diff line number Diff line
@@ -916,6 +916,7 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb, 
{

	struct ip6_tnl *t = netdev_priv(dev);

	struct net_device_stats *stats = &t->dev->stats;

	__be16 payload_protocol;

	int ret;



	if (!pskb_inet_may_pull(skb))
@@ -924,7 +925,8 @@ static netdev_tx_t ip6gre_tunnel_xmit(struct sk_buff *skb, 
	if (!ip6_tnl_xmit_ctl(t, &t->parms.laddr, &t->parms.raddr))

		goto tx_err;



	switch (skb->protocol) {

	payload_protocol = skb_protocol(skb, true);

	switch (payload_protocol) {

	case htons(ETH_P_IP):

		ret = ip6gre_xmit_ipv4(skb, dev);

		break;