On 10 May 2013 14:38, Ben Pfaff <b...@nicira.com> wrote: > On Fri, May 10, 2013 at 02:15:50PM -0400, Ed Maste wrote: >> This is an incremental to patch v3 of >> netdev: Factor restoring flags into new "struct netdev_saved_flags", >> implementing the equivalent change for netdev-bsd. >> >> Signed-off-by: Ed Maste <ema...@freebsd.org> >> --- >> With this, the first patch now passes unit tests for me on FreeBSD. > > Great, I folded that in and applied this patch to master.
Thanks. I find it a little ironic that the trouble here was caused by the netdev vs. netdev_dev issue itself. This also explains why the end result is almost the same (when netdev_dev is removed in patch 4). > There were merge conflicts in netdev-bsd when I continued to rebase > through the rest of the series, and I am not confident that I resolved > them correctly (I did not try a build on FreeBSD), so I will repost the > rest for your review. The conflict resolutions match what I ended up with when I reapplied patches 2-4 on top of my incremental, at least. All unit tests now pass on FreeBSD for patches 2-4 in v4; I haven't tried an actual system test. _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
