---

yaml --- r: 328415 b: refs/heads/master c: 9fbef05 h: refs/heads/master i: 328413: 27d4d30 328411: cac54c4 328407: d69164a 328399: e975254 328383: 3bf36d2 v: v3
git-mirror · Oct 1, 2012 · 25cbb0d · 25cbb0d
1 parent 2e65a40
commit 25cbb0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66dc81ecd71332783c92fb170950d5ddb43da461
+refs/heads/master: 9fbef059d63cbc3249a3ddfd9a12cb511c8be55e
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
@@ -222,7 +222,7 @@ static struct rtnl_link_stats64 *ipgre_get_stats64(struct net_device *dev,
 
 /* Does key in tunnel parameters match packet */
 static bool ipgre_key_match(const struct ip_tunnel_parm *p,
-			    __u32 flags, __be32 key)
+			    __be16 flags, __be32 key)
 {
 	if (p->i_flags & GRE_KEY) {
 		if (flags & GRE_KEY)
@@ -237,7 +237,7 @@ static bool ipgre_key_match(const struct ip_tunnel_parm *p,
 
 static struct ip_tunnel *ipgre_tunnel_lookup(struct net_device *dev,
 					     __be32 remote, __be32 local,
-					     __u32 flags, __be32 key,
+					     __be16 flags, __be32 key,
 					     __be16 gre_proto)
 {
 	struct net *net = dev_net(dev);