On Wed, Oct 9, 2019 at 2:25 PM Greg Rose <[email protected]> wrote: > > From: Pablo Neira Ayuso <[email protected]> > > Upstream commit: > commit aef833c58d321f09ae4ce4467723542842ba9faf > Author: Pablo Neira Ayuso <[email protected]> > Date: Fri Jul 19 18:20:13 2019 +0200 > > 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 <[email protected]> > Acked-by: Jiri Pirko <[email protected]> > Signed-off-by: David S. Miller <[email protected]> > > Cc: Pablo Neira Ayuso <[email protected]> > Signed-off-by: Greg Rose <[email protected]> > ---
Looks good to me. Acked-by: Yi-Hung Wei <[email protected]> _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
