Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[thirdparty/kernel/linux.git] / net / ipv4 / gre_demux.c

diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c
index 3757fd93523f0f3ecad7ba187c240c7a36606d93..6701a98d9a9ff71634c4215dc1843f9ef8141ae4 100644 (file)
--- a/net/ipv4/gre_demux.c
+++ b/net/ipv4/gre_demux.c
@@ -73,7 +73,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi,
        if (unlikely(greh->flags & (GRE_VERSION | GRE_ROUTING)))
                return -EINVAL;
 
-       tpi->flags = gre_flags_to_tnl_flags(greh->flags);
+       gre_flags_to_tnl_flags(tpi->flags, greh->flags);
        hdr_len = gre_calc_hlen(tpi->flags);
 
        if (!pskb_may_pull(skb, nhs + hdr_len))