debian: Don't require ipsec_local_ip to configure IPsec

[sliver-openvswitch.git] / lib / netdev-vport.c

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 5566289..13b1d93 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -436,7 +436,6 @@ parse_tunnel_config(const struct netdev_dev *dev, const struct shash *args,
     bool is_gre = !strcmp(type, "gre");
     struct tnl_port_config config;
     struct shash_node *node;
-    bool ipsec_ip_set = false;
     bool ipsec_mech_set = false;
 
     memset(&config, 0, sizeof config);
@@ -502,8 +501,6 @@ parse_tunnel_config(const struct netdev_dev *dev, const struct shash *args,
             if (!strcmp(node->data, "false")) {
                 config.flags &= ~TNL_F_HDR_CACHE;
             }
-        } else if (!strcmp(node->name, "ipsec_local_ip")) {
-            ipsec_ip_set = true;
         } else if (!strcmp(node->name, "ipsec_cert")
                    || !strcmp(node->name, "ipsec_psk")) {
             ipsec_mech_set = true;
@@ -515,7 +512,7 @@ parse_tunnel_config(const struct netdev_dev *dev, const struct shash *args,
 
    /* IPsec doesn't work when header caching is enabled.  Disable it if the
     * IPsec local IP address and authentication mechanism have been defined. */
-    if (ipsec_ip_set && ipsec_mech_set) {
+    if (ipsec_mech_set) {
         VLOG_INFO("%s: header caching disabled due to use of IPsec", name);
         config.flags &= ~TNL_F_HDR_CACHE;
     }