diff options
| author |   Eric Dumazet <edumazet@google.com> | 2015-05-15 08:58:45 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-05-17 13:08:29 -0400 |
| commit | 252a8fbe819d041b29789e2035cd1760f373345f (patch) | |
| tree | 717fd56b24c122d61686a2bbbaa605f688dbbe0a /net/ipv4/ipip.c | |
| parent | net: fix sparse error in csum_replace4() (diff) | |
| download | linux-dev-252a8fbe819d041b29789e2035cd1760f373345f.tar.xz linux-dev-252a8fbe819d041b29789e2035cd1760f373345f.zip | |
ipip: fix one sparse error
make C=2 CF=-D__CHECK_ENDIAN__ net/ipv4/ipip.o
CHECK net/ipv4/ipip.c
net/ipv4/ipip.c:254:27: warning: incorrect type in assignment (different base types)
net/ipv4/ipip.c:254:27: expected restricted __be32 [addressable] [usertype] o_key
net/ipv4/ipip.c:254:27: got restricted __be16 [addressable] [usertype] i_flags
Fixes: 3b7b514f44bf ("ipip: fix a regression in ioctl")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index ff96396ebec5..254238daf58b 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -251,7 +251,8 @@ ipip_tunnel_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return -EINVAL; } - p.i_key = p.o_key = p.i_flags = p.o_flags = 0; + p.i_key = p.o_key = 0; + p.i_flags = p.o_flags = 0; if (p.iph.ttl) p.iph.frag_off |= htons(IP_DF); |