diff options
| author | Pablo Neira Ayuso | 2019-07-19 18:20:13 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-07-20 06:27:45 +0200 |
| commit | aef833c58d321f09ae4ce4467723542842ba9faf (patch) | |
| tree | 2d2567ee29b74b37e128ce44bb8c7147e175db56 /net/dsa | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (diff) | |
| download | kernel-qcow2-linux-aef833c58d321f09ae4ce4467723542842ba9faf.tar.gz kernel-qcow2-linux-aef833c58d321f09ae4ce4467723542842ba9faf.tar.xz kernel-qcow2-linux-aef833c58d321f09ae4ce4467723542842ba9faf.zip | |
net: openvswitch: rename flow_stats to sw_flow_stats
There is a flow_stats structure defined in include/net/flow_offload.h
and a follow up patch adds #include <net/flow_offload.h> to
net/sch_generic.h.
This breaks compilation since OVS codebase includes net/sock.h which
pulls in linux/filter.h which includes net/sch_generic.h.
In file included from ./include/net/sch_generic.h:18:0,
from ./include/linux/filter.h:25,
from ./include/net/sock.h:59,
from ./include/linux/tcp.h:19,
from net/openvswitch/datapath.c:24
This definition takes precedence on OVS since it is placed in the
networking core, so rename flow_stats in OVS to sw_flow_stats since
this structure is contained in sw_flow.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa')
0 files changed, 0 insertions, 0 deletions