diff options
| author |   Pravin B Shelar <pshelar@nicira.com> | 2015-10-20 20:47:46 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-22 06:46:13 -0700 |
| commit | 99e28f18e3f4daa2091802e07ebeb4f541631320 (patch) | |
| tree | 96f49dcfd8cb91a8f0e214b7d31e48e5a5e846a2 | |
| parent | Merge branch 'bpf-perf' (diff) | |
| download | linux-dev-99e28f18e3f4daa2091802e07ebeb4f541631320.tar.xz linux-dev-99e28f18e3f4daa2091802e07ebeb4f541631320.zip | |
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: 6b26ba3a7d ("openvswitch: netlink attributes for IPv6 tunneling")
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/openvswitch/flow_netlink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index 6799c8d470c6..80e1f09397c0 100644 --- a/net/openvswitch/flow_netlink.c +++ b/net/openvswitch/flow_netlink.c @@ -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); |