[ovs-git] [openvswitch/ovs] 79c3c9: tunnel: Mark GRE64 tunnel protocol deprecated.

GitHub noreply at github.com
Tue Jul 28 20:56:51 UTC 2015


  Branch: refs/heads/branch-2.4
  Home:   https://github.com/openvswitch/ovs
  Commit: 79c3c9d61fd735151c6c4f6f59710680a96e6351
      https://github.com/openvswitch/ovs/commit/79c3c9d61fd735151c6c4f6f59710680a96e6351
  Author: Pravin B Shelar <pshelar at nicira.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M NEWS
    M datapath/vport-gre.c
    M lib/netdev-vport.c
    M tests/ofproto-macros.at
    M vswitchd/vswitch.xml

  Log Message:
  -----------
  tunnel: Mark GRE64 tunnel protocol deprecated.

GRE64 was introduced to extend GRE key from 32-bit to 64-bit using
key and sequence number field. But GRE64 is not standard
protocol. There are not many users of this protocol. Therefore we
have decided to deprecate it. Since GRE64 is not in upstream
OVS kernel module removing it will bring upstream and out-of-tree
module closer.

Signed-off-by: Pravin B Shelar <pshelar at nicira.com>
Acked-by: Jesse Gross <jesse at nicira.com>


  Commit: 378af564556dafeeeb7e44e588538a9059dae661
      https://github.com/openvswitch/ovs/commit/378af564556dafeeeb7e44e588538a9059dae661
  Author: Gary Mussar <gmussar at ciena.com>
  Date:   2015-07-28 (Tue, 28 Jul 2015)

  Changed paths:
    M acinclude.m4

  Log Message:
  -----------
  dpdk: Fix detection of vhost_cuse in dpdk rte_config.h

Dpdk allows users to create a config that includes other config files and
then override values.

Eg.
defconfig_x86_64-native_vhost_cuse-linuxapp-gcc:

CONFIG_RTE_BUILD_COMBINE_LIBS=y
CONFIG_RTE_BUILD_SHARED_LIB=n
CONFIG_RTE_LIBRTE_VHOST=y
CONFIG_RTE_LIBRTE_VHOST_USER=n

This allows you to have both a vhostuser and vhostcuse config in the same
source tree without the need to replicate everything in those config files
just to change a couple of settings. The resultant .config file has all of
the settings from the included files with the updated settings at the end.
The resultant rte_config.h contains multiple undefs and defines for the
overridden settings.

Eg.
  > grep RTE_LIBRTE_VHOST_USER x86_64-native_vhost_cuse-linuxapp-gcc/include/rte_config.h
  #undef RTE_LIBRTE_VHOST_USER
  #define RTE_LIBRTE_VHOST_USER 1
  #undef RTE_LIBRTE_VHOST_USER

The current mechanism to detect the RTE_LIBRTE_VHOST_USER setting merely
greps the rte_config.h file for the string "define RTE_LIBRTE_VHOST_USER 1"
rather than the final setting of RTE_LIBRTE_VHOST_USER. The following patch
changes this test to detect the final setting of RTE_LIBRTE_VHOST_USER.

Signed-off-by: Gary Mussar <gmussar at ciena.com>
Acked-by: Pravin B Shelar <pshelar at nicira.com


Compare: https://github.com/openvswitch/ovs/compare/b1af2041dc9f...378af564556d


More information about the git mailing list