From patchwork Thu Jul 30 18:12:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 502245 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AC7C114031A for ; Fri, 31 Jul 2015 04:15:26 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754518AbbG3SOd (ORCPT ); Thu, 30 Jul 2015 14:14:33 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:33654 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754623AbbG3SNY (ORCPT ); Thu, 30 Jul 2015 14:13:24 -0400 Received: by padck2 with SMTP id ck2so27192313pad.0 for ; Thu, 30 Jul 2015 11:13:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3SQLPd/D6rH7Xlwe/dAglc9WcWVHeot//SqBOMXIg4E=; b=C1iBDpPAlqY6lZvtcGCx1PY8drrN+S2e2UC+BXFfRDi5dHet4l2LhenvO1erqu3HZA VLFL9n4iXAAhmnPn7xkaZN5mJwxhIGYegHOyeuqnOTtAjcaogKUS9SGrxmLIN1H317qT 8hvYdIRG5a6tSNdniMnSHgg6Yq8kBLSX7UxXjaHVrl8aZ1/fJskie8Y5MqRsl0+dUt+k 9WGkWAgBAUCUYBnArz/JY8UJe1Fc4irvAmH6obqQX8+OJNcpi3tlMI8PViCy9rQ9nU71 l1FYEALyP8B2ePsHJhWbvTBkjKnvbytlMoG381cHPPv59zBU5Y8UypHbYfY+LadSsUqQ 3UCw== X-Gm-Message-State: ALoCoQlVA1WvYdgQqH9QOUlqkufQRVRDqrvy6x9jYtsUK1QOVg6my1lseSO5mMV7y/9OP/2lHrU8 X-Received: by 10.66.90.166 with SMTP id bx6mr108231804pab.76.1438280004160; Thu, 30 Jul 2015 11:13:24 -0700 (PDT) Received: from localhost.localdomain ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id c5sm3310710pds.87.2015.07.30.11.13.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 30 Jul 2015 11:13:23 -0700 (PDT) From: Joe Stringer To: netdev@vger.kernel.org, pablo@netfilter.org Cc: linux-kernel@vger.kernel.org, kaber@trash.net, jpettit@nicira.com, pshelar@nicira.com, azhou@nicira.com, jesse@nicira.com, fwestpha@redhat.com, hannes@redhat.com, tgraf@noironetworks.com Subject: [PATCH net-next 7/9] netfilter: Always export nf_connlabels_replace() Date: Thu, 30 Jul 2015 11:12:41 -0700 Message-Id: <1438279963-29563-8-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438279963-29563-1-git-send-email-joestringer@nicira.com> References: <1438279963-29563-1-git-send-email-joestringer@nicira.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The following patches will reuse this code from OVS. Signed-off-by: Joe Stringer --- net/netfilter/nf_conntrack_labels.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/netfilter/nf_conntrack_labels.c b/net/netfilter/nf_conntrack_labels.c index bb53f12..daa7c13 100644 --- a/net/netfilter/nf_conntrack_labels.c +++ b/net/netfilter/nf_conntrack_labels.c @@ -48,7 +48,6 @@ int nf_connlabel_set(struct nf_conn *ct, u16 bit) } EXPORT_SYMBOL_GPL(nf_connlabel_set); -#if IS_ENABLED(CONFIG_NF_CT_NETLINK) static void replace_u32(u32 *address, u32 mask, u32 new) { u32 old, tmp; @@ -89,7 +88,6 @@ int nf_connlabels_replace(struct nf_conn *ct, return 0; } EXPORT_SYMBOL_GPL(nf_connlabels_replace); -#endif static struct nf_ct_ext_type labels_extend __read_mostly = { .len = sizeof(struct nf_conn_labels),