summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2012-10-01 07:21:14 +0200
committerDavid S. Miller <davem@davemloft.net>2012-10-01 23:35:31 +0200
commit9fbef059d63cbc3249a3ddfd9a12cb511c8be55e (patch)
treefe01d23f12e8292a1c9684e806e03a6524185774 /net
parentasix: Adds support for Lenovo 10/100 USB dongle. (diff)
downloadlinux-9fbef059d63cbc3249a3ddfd9a12cb511c8be55e.tar.xz
linux-9fbef059d63cbc3249a3ddfd9a12cb511c8be55e.zip
gre: fix sparse warning
Use be16 consistently when looking at flags. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-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,
/* 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);