From: Simon Horman <simon.horman@netronome.com>
Date: Thu, 9 Jun 2016 09:03:34 +0000 (+0900)
Subject: sit: remove unnecessary protocol check in ipip6_tunnel_xmit()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=adba931fbc825efca7c821f0d76baed0a8dc9189;p=linux-beck.git

sit: remove unnecessary protocol check in ipip6_tunnel_xmit()

ipip6_tunnel_xmit() is called immediately after checking that
skb->protocol is  htons(ETH_P_IPV6) so there is no need
to check it a second time.

Found by inspection.

Signed-off-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 0a5a255277e5..d9f2bd6ef72d 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -825,9 +825,6 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
 	u8 protocol = IPPROTO_IPV6;
 	int t_hlen = tunnel->hlen + sizeof(struct iphdr);
 
-	if (skb->protocol != htons(ETH_P_IPV6))
-		goto tx_error;
-
 	if (tos == 1)
 		tos = ipv6_get_dsfield(iph6);