]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ipv4/ip_tunnel_core: Use eth_proto_is_802_3
authorAlexander Duyck <alexander.h.duyck@redhat.com>
Mon, 4 May 2015 21:33:59 +0000 (14:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2015 23:24:42 +0000 (19:24 -0400)
Replace "ntohs(proto) >= ETH_P_802_3_MIN" w/ eth_proto_is_802_3(proto).

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_tunnel_core.c

index ce63ab21b6cda87f8caea29967a4651b7f78c909..3998b1822d8521ad391ac26db1e694a3cd7ad011 100644 (file)
@@ -98,7 +98,7 @@ int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto)
                        return -ENOMEM;
 
                eh = (struct ethhdr *)skb->data;
-               if (likely(ntohs(eh->h_proto) >= ETH_P_802_3_MIN))
+               if (likely(eth_proto_is_802_3(eh->h_proto)))
                        skb->protocol = eh->h_proto;
                else
                        skb->protocol = htons(ETH_P_802_2);