aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/ip_gre.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index b1871d993d22..7240f8e2dd45 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -222,7 +222,7 @@ static struct rtnl_link_stats64 *ipgre_get_stats64(struct net_device *dev,
222 222
223/* Does key in tunnel parameters match packet */ 223/* Does key in tunnel parameters match packet */
224static bool ipgre_key_match(const struct ip_tunnel_parm *p, 224static bool ipgre_key_match(const struct ip_tunnel_parm *p,
225 __u32 flags, __be32 key) 225 __be16 flags, __be32 key)
226{ 226{
227 if (p->i_flags & GRE_KEY) { 227 if (p->i_flags & GRE_KEY) {
228 if (flags & GRE_KEY) 228 if (flags & GRE_KEY)
@@ -237,7 +237,7 @@ static bool ipgre_key_match(const struct ip_tunnel_parm *p,
237 237
238static struct ip_tunnel *ipgre_tunnel_lookup(struct net_device *dev, 238static struct ip_tunnel *ipgre_tunnel_lookup(struct net_device *dev,
239 __be32 remote, __be32 local, 239 __be32 remote, __be32 local,
240 __u32 flags, __be32 key, 240 __be16 flags, __be32 key,
241 __be16 gre_proto) 241 __be16 gre_proto)
242{ 242{
243 struct net *net = dev_net(dev); 243 struct net *net = dev_net(dev);