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

Commit 99e28f18 authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

openvswitch: Fix incorrect type use. 



Patch fixes following sparse warning.
net/openvswitch/flow_netlink.c:583:30: warning: incorrect type in assignment (different base types)
net/openvswitch/flow_netlink.c:583:30:    expected restricted __be16 [usertype] ipv4
net/openvswitch/flow_netlink.c:583:30:    got int

Fixes: 6b26ba3a ("openvswitch: netlink attributes for IPv6 tunneling")
Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Acked-by: default avatarJiri Benc <jbenc@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 721daebb

net/openvswitch/flow_netlink.c

+3 −3
Original line number Diff line number Diff line
@@ -548,11 +548,11 @@ static int ip_tun_from_nlattr(const struct nlattr *attr, 
			      struct sw_flow_match *match, bool is_mask,

			      bool log)

{

	bool ttl = false, ipv4 = false, ipv6 = false;

	__be16 tun_flags = 0;

	int opts_type = 0;

	struct nlattr *a;

	int rem;

	bool ttl = false;

	__be16 tun_flags = 0, ipv4 = false, ipv6 = false;

	int opts_type = 0;



	nla_for_each_nested(a, attr, rem) {

		int type = nla_type(a);