This series includes several backports which affect the datapath and brings it closer to upstream. It also allows to build the datapath against current net and net-next kernels.
v3: - As requested by Pravin: - Convert compat code to use vlan_insert_tag_set_proto() - Remove any reference to old __vlan_insert_tag() v2: - Improved commit message of patch 2 - New patch to address arg changes to vxlan_sock_add() Thomas Graf (8): datapath: Account for rename to vlan_insert_tag_set_proto() datapath: Add __vlan_insert_tag() compat helper if not available datapath: move make_writable helper into common code datapath: move vlan pop/push functions into common code datapath: introduce rtnl ops stub datapath: replace remaining users of arch_fast_hash with jhash datapath: Account for new flags args of vxlan_sock_add() travis: Update build matrix to include latest stable kernels .travis.yml | 17 ++-- acinclude.m4 | 7 +- datapath/actions.c | 120 +++++--------------------- datapath/datapath.c | 11 ++- datapath/flow_table.c | 4 +- datapath/linux/Modules.mk | 4 - datapath/linux/compat/gso.c | 4 +- datapath/linux/compat/hash-x86.c | 95 -------------------- datapath/linux/compat/hash.c | 51 ----------- datapath/linux/compat/include/asm/hash.h | 18 ---- datapath/linux/compat/include/linux/hash.h | 44 ---------- datapath/linux/compat/include/linux/if_vlan.h | 46 ++++++++-- datapath/linux/compat/include/linux/skbuff.h | 15 ++++ datapath/linux/compat/include/net/vxlan.h | 2 +- datapath/linux/compat/skbuff-openvswitch.c | 110 +++++++++++++++++++++++ datapath/linux/compat/vxlan.c | 8 +- datapath/vport-geneve.c | 6 +- datapath/vport-gre.c | 6 +- datapath/vport-internal_dev.c | 21 ++++- datapath/vport-internal_dev.h | 2 + datapath/vport-vxlan.c | 2 +- 21 files changed, 248 insertions(+), 345 deletions(-) delete mode 100644 datapath/linux/compat/hash-x86.c delete mode 100644 datapath/linux/compat/hash.c delete mode 100644 datapath/linux/compat/include/asm/hash.h delete mode 100644 datapath/linux/compat/include/linux/hash.h -- 1.9.3 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev