From patchwork Mon Sep 11 17:56:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 812530 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GY8VLvjz"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xrbPs1Qmvz9s7F for ; Tue, 12 Sep 2017 04:03:13 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 63857BBD; Mon, 11 Sep 2017 17:56:37 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 70DF3B8A for ; Mon, 11 Sep 2017 17:56:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 367A4E0 for ; Mon, 11 Sep 2017 17:56:34 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id i130so2961779pgc.0 for ; Mon, 11 Sep 2017 10:56:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GtvOG6nV2JH+Y7/d1ncsC6tRujV+5/9Tjcr9aMNbjbM=; b=GY8VLvjzet+ZkFdodrWIVs8bpPn3/iBBzEPMee/zjyxqy7g0lor2Csp17KbiBSbZB8 ILmW62eeAHgGlmFkQyCmLCW/C0FIRJP6DTfQZTw2x7ONtQKIyNA7XKiSL1AeHRWGurF5 iBr3rpTZWDBpZElL8f4rpSzz7O9wdl88dwfUKDDvbuUxqp9QgpV8JDXOWS5uB/l60Fii g2Yj+xRv8Uie1mxbjEkr2cOaIXPhPhQRyYs9HzAAQNe257a6HybVxqvxRFMJkQ5FTPQK MlBJTvr+9Ry6ji0wS2LCubE1BDvd4mUvU2PmQ0kVySMQg4lFK2P9ucHVnj/jt+y55mep jcDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GtvOG6nV2JH+Y7/d1ncsC6tRujV+5/9Tjcr9aMNbjbM=; b=lUuTphzn8xm25NeK9cSNLIr8D0VWXt54LAhilccIQM1DXomoi0mAGdzIg2KoMys34M HQ8x1dGIrkOx0q0cpWczZJgJjWzuLEh2GkpYz/8tcT2QzP4IsYeSbUHee/p3wRWprnEF 1EkFkLZpSg5I7ZubG193mLUJYVxU94rW+ocjjqRqtlVYnO+SGMsOw/uACA1l0JN4etVf d2cHwVgT4aEO5fx4ZVLE7zW5Pt0iNS02FqR3Xs10Z6dLDT6/h65aPeLq3L8mvVmvFWRA jnqC7cKhIV3OB77AhMFSjRhV7B7tnt6MVZPJXI4FFJFWj9Da1Wba+FJ0kX8UI0DimcyN W97g== X-Gm-Message-State: AHPjjUiPmxMPGuQDZGfcG+KiJ8LHn4ToH9UHdJfVka7kjOYIITZc2fH8 fOLeczmT6YKeqHSs X-Google-Smtp-Source: ADKCNb654dT71JvszH9CDCCx2DfC0gRd9do9BVQX5Rl5MYkpupZPayeKG89QlnW4RS0ZWGjXRLTJSg== X-Received: by 10.101.85.70 with SMTP id t6mr12090464pgr.255.1505152593416; Mon, 11 Sep 2017 10:56:33 -0700 (PDT) Received: from gizo.domain (67-5-132-83.ptld.qwest.net. [67.5.132.83]) by smtp.gmail.com with ESMTPSA id h185sm16733084pfe.160.2017.09.11.10.56.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Sep 2017 10:56:32 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 11 Sep 2017 10:56:07 -0700 Message-Id: <1505152570-6143-12-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> References: <1505152570-6143-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 12/15] datapath: Fix up vxlan device flags X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org I missed a couple of usages of the flags parameter from vxlan_dev while adding compatibility code to handle the removal of the flags. Add the checks so that the module can compile for Linux kernel release 4.13 Fixes: 143656435c ("datapath: get rid of redundant vxlan_dev.flags") Signed-off-by: Greg Rose --- datapath/vport-vxlan.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c index 2910694..c7139ab 100644 --- a/datapath/vport-vxlan.c +++ b/datapath/vport-vxlan.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Nicira, Inc. + * Copyright (c) 2015,2017 Nicira, Inc. * Copyright (c) 2013 Cisco Systems, Inc. * * This program is free software; you can redistribute it and/or @@ -60,14 +60,22 @@ static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb) return -EMSGSIZE; nla_nest_end(skb, exts); +#ifdef HAVE_VXLAN_DEV_CFG + } else if (vxlan->cfg.flags & VXLAN_F_GPE) { +#else } else if (vxlan->flags & VXLAN_F_GPE) { +#endif struct nlattr *exts; exts = nla_nest_start(skb, OVS_TUNNEL_ATTR_EXTENSION); if (!exts) return -EMSGSIZE; +#ifdef HAVE_VXLAN_DEV_CFG + if (vxlan->cfg.flags & VXLAN_F_GPE && +#else if (vxlan->flags & VXLAN_F_GPE && +#endif nla_put_flag(skb, OVS_VXLAN_EXT_GPE)) return -EMSGSIZE;