lkml.org 
[lkml]   [2019]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 203/306] openvswitch: fix linking without CONFIG_NF_CONNTRACK_LABELS
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit a277d516de5f498c91d91189717ef7e01102ad27 ]

    When CONFIG_CC_OPTIMIZE_FOR_DEBUGGING is enabled, the compiler
    fails to optimize out a dead code path, which leads to a link failure:

    net/openvswitch/conntrack.o: In function `ovs_ct_set_labels':
    conntrack.c:(.text+0x2e60): undefined reference to `nf_connlabels_replace'

    In this configuration, we can take a shortcut, and completely
    remove the contrack label code. This may also help the regular
    optimization.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/openvswitch/conntrack.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
    index 35ae64cbef33f..46aa1aa51db41 100644
    --- a/net/openvswitch/conntrack.c
    +++ b/net/openvswitch/conntrack.c
    @@ -1199,7 +1199,8 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key,
    &info->labels.mask);
    if (err)
    return err;
    - } else if (labels_nonzero(&info->labels.mask)) {
    + } else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&
    + labels_nonzero(&info->labels.mask)) {
    err = ovs_ct_set_labels(ct, key, &info->labels.value,
    &info->labels.mask);
    if (err)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-27 22:04    [W:2.429 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site