From 25cbb0d41621f5aa1251db02b99e8fc1f983b051 Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Mon, 1 Oct 2012 05:21:14 +0000
Subject: [PATCH] --- yaml --- r: 328415 b: refs/heads/master c:
 9fbef059d63cbc3249a3ddfd9a12cb511c8be55e h: refs/heads/master i:   328413:
 27d4d3078f007fe6e1ebcfe8949beeba205522df   328411:
 cac54c46439175ce1e31a6d6ec53b83fb2334199   328407:
 d69164a1fba7b662fcc3b955a447778fa8b6d28e   328399:
 e97525419cfacbdb85fc58aa3a72358c53946f2e   328383:
 3bf36d231bf64f67f1aaaee5efb282fa9fa4f48e v: v3

---
 [refs]                  | 2 +-
 trunk/net/ipv4/ip_gre.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d45a8f33a43a..08b30cd27007 100644
--- 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
index b1871d993d22..7240f8e2dd45 100644
--- 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);