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.hor...@netronome.com>
Reviewed-by: Dinan Gunawardena <dinan.gunaward...@netronome.com>
---
 This patch is targeted at upstream kernel "net-next" as a trivial fix.
 Please review.

 net/ipv6/sit.c | 3 ---
 1 file changed, 3 deletions(-)

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);
 
-- 
2.1.4

Reply via email to