| Message ID | 1415265526-1524-1-git-send-email-pshelar@nicira.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Pravin B Shelar <pshelar@nicira.com> Date: Thu, 6 Nov 2014 01:18:46 -0800 > First two patches are related to OVS MPLS support. Rest of patches > are mostly refactoring and minor improvements to openvswitch. > > v1-v2: > - Fix conflicts due to "gue: Remote checksum offload" Pulled, thanks Pravin. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
First two patches are related to OVS MPLS support. Rest of patches are mostly refactoring and minor improvements to openvswitch. v1-v2: - Fix conflicts due to "gue: Remote checksum offload" ---------------------------------------------------------------- The following changes since commit e1b2cb655060e081e73b384b1fc8b2e978f73467: fou: Fix typo in returning flags in netlink (2014-11-05 22:18:20 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git net_next_ovs for you to fetch changes up to a85311bf1f9f8185682990cafdd4e0572c0ed373: openvswitch: Avoid NULL mask check while building mask (2014-11-05 23:52:35 -0800) ---------------------------------------------------------------- Andy Zhou (2): openvswitch: refactor do_output() to move NULL check out of fast path openvswitch: Refactor get_dp() function into multiple access APIs. Chunhe Li (1): openvswitch: Drop packets when interdev is not up Jarno Rajahalme (1): openvswitch: Fix the type of struct ovs_key_nd nd_target field. Jesse Gross (1): openvswitch: Additional logging for -EINVAL on flow setups. Joe Stringer (3): openvswitch: Remove redundant tcp_flags code. openvswitch: Refactor ovs_flow_cmd_fill_info(). openvswitch: Move key_attr_size() to flow_netlink.h. Lorand Jakab (1): openvswitch: Remove flow member from struct ovs_skb_cb Pravin B Shelar (4): net: Remove MPLS GSO feature. openvswitch: Move table destroy to dp-rcu callback. openvswitch: Refactor action alloc and copy api. openvswitch: Avoid NULL mask check while building mask Simon Horman (1): openvswitch: Add basic MPLS support to kernel include/linux/netdev_features.h | 5 +- include/linux/netdevice.h | 1 - include/linux/skbuff.h | 4 +- include/net/mpls.h | 39 +++++ include/uapi/linux/openvswitch.h | 38 ++++- net/core/dev.c | 3 +- net/core/ethtool.c | 1 - net/ipv4/af_inet.c | 1 - net/ipv4/tcp_offload.c | 1 - net/ipv4/udp_offload.c | 3 +- net/ipv6/ip6_offload.c | 1 - net/ipv6/udp_offload.c | 3 +- net/mpls/mpls_gso.c | 3 +- net/openvswitch/Kconfig | 1 + net/openvswitch/actions.c | 136 ++++++++++++--- net/openvswitch/datapath.c | 215 ++++++++++++----------- net/openvswitch/datapath.h | 4 +- net/openvswitch/flow.c | 30 ++++ net/openvswitch/flow.h | 17 +- net/openvswitch/flow_netlink.c | 322 +++++++++++++++++++++++++---------- net/openvswitch/flow_netlink.h | 5 +- net/openvswitch/flow_table.c | 11 +- net/openvswitch/flow_table.h | 2 +- net/openvswitch/vport-internal_dev.c | 5 + 24 files changed, 606 insertions(+), 245 deletions(-) create mode 100644 include/net/mpls.h -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html