gre: Fix wrong tpi->proto in WCCP

[deliverable/linux.git] / net / ipv4 / ip_gre.c

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 2b267e71ebf5f25dc38587c6b7922b93e890694f..aaeb478b54cd2657ae8c3d838141a61b9d5eb413 100644 (file)
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -222,7 +222,7 @@ static void gre_err(struct sk_buff *skb, u32 info)
        struct tnl_ptk_info tpi;
        bool csum_err = false;
 
-       if (gre_parse_header(skb, &tpi, &csum_err) < 0) {
+       if (gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IP)) < 0) {
                if (!csum_err)          /* ignore csum errors. */
                        return;
        }
@@ -335,7 +335,7 @@ static int gre_rcv(struct sk_buff *skb)
        }
 #endif
 
-       hdr_len = gre_parse_header(skb, &tpi, &csum_err);
+       hdr_len = gre_parse_header(skb, &tpi, &csum_err, htons(ETH_P_IP));
        if (hdr_len < 0)
                goto drop;