ip_vti: fix sparse warnings for VTI_ISVTI

This patch fixes the following sparse warnings: net/ipv4/ip_tunnel.c:245:53: warning: restricted __be16 degrades to integer net/ipv4/ip_vti.c:321:19: warning: incorrect type in assignment (different base types) net/ipv4/ip_vti.c:321:19: expected restricted __be16 [addressable] [assigned] [usertype] i_flags net/ipv4/ip_vti.c:321:19: got int net/ipv4/ip_vti.c:447:24: warning: incorrect type in assignment (different base types) net/ipv4/ip_vti.c:447:24: expected restricted __be16 [usertype] i_flags net/ipv4/ip_vti.c:447:24: got int Since VTI_ISVTI is always used with ip_tunnel_parm->i_flags (which is __be16), we can __force cast VTI_ISVTI to __be16 in header file.

Dmitry Popov committed 12 years ago

Commit efd0f111 parent 2f872081 file · +1 −1Browse files

Showing the changes to include/uapi/linux (1 of 1 file). Show all

Unified · Split

include/uapi/linux/if_tunnel.h+1−1

@@ -100,7 +100,7 @@ enum { · 99 unmodified lines
100	100	#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1)
101	101
102	102	/* VTI-mode i_flags */
103		−#define VTI_ISVTI 0x0001
	103	+#define VTI_ISVTI ((__force __be16)0x0001)
104	104
105	105	enum {
106	106	IFLA_VTI_UNSPEC,