On Wed, Jan 17, 2024 at 05:31:56PM +0000, Simon Horman wrote: > On Wed, Jan 17, 2024 at 05:07:25PM +0800, Dexia Li via dev wrote: > > For userspace vxlan and geneve tunnel tso, this commit > > fix one packet leak and modify style issues. > > > > Signed-off-by: Dexia Li <[email protected]>
... > With the changes above in place the netdev parameter of > dp_packet_tnl_ol_process() is no longer used. > As GitHub actions configure OvS compilation with --enable-Werror > this results in a build error [1]. > > [1] https://github.com/ovsrobot/ovs/actions/runs/7553819191 > > In order to move things along I have locally squashed the following into > this patch: > > diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c > index d513194dc462..5065a40a7fc0 100644 > --- a/lib/netdev-native-tnl.c > +++ b/lib/netdev-native-tnl.c > @@ -244,8 +244,7 @@ udp_extract_tnl_md(struct dp_packet *packet, struct > flow_tnl *tnl, > /* Calculate inner l2 l3 l4 len as tunnel outer header is not > * encapsulated now. */ > static void > -dp_packet_tnl_ol_process(const struct netdev *netdev, > - struct dp_packet *packet, > +dp_packet_tnl_ol_process(struct dp_packet *packet, > const struct ovs_action_push_tnl *data) > { > struct udp_header *udp = NULL; > @@ -304,7 +303,7 @@ dp_packet_tnl_ol_process(const struct netdev *netdev, > } > > void > -netdev_tnl_push_udp_header(const struct netdev *netdev, > +netdev_tnl_push_udp_header(const struct netdev *netdev OVS_UNUSED, > struct dp_packet *packet, > const struct ovs_action_push_tnl *data) > { > @@ -313,7 +312,7 @@ netdev_tnl_push_udp_header(const struct netdev *netdev, > uint16_t l3_ofs = packet->l3_ofs; > uint16_t l4_ofs = packet->l4_ofs; > > - dp_packet_tnl_ol_process(netdev, packet, data); > + dp_packet_tnl_ol_process(packet, data); > udp = netdev_tnl_push_ip_header(packet, data->header, data->header_len, > &ip_tot_size, 0); > > > And pushed it to my own tree to allow GitHub actions to run [2]. > As of writhing those tests are still running, but so far there are no > errors. > > [2] https://github.com/horms/ovs/actions/runs/7559436191 Sorry, I forgot to trim my previous email properly. And I didn't notice that Ilya had already responded to this patch. _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
