Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 252a8fbe authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

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: 3b7b514f ("ipip: fix a regression in ioctl")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d53a2aa3

net/ipv4/ipip.c

+2 −1
Original line number Diff line number Diff line
@@ -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);