From patchwork Thu Sep 28 19:39:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Zhou X-Patchwork-Id: 819724 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=) 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 3y34m85wBvz9t5x for ; Fri, 29 Sep 2017 05:40:24 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A72E7BDB; Thu, 28 Sep 2017 19:40:22 +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 AFBF9B30 for ; Thu, 28 Sep 2017 19:40:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BC9C2470 for ; Thu, 28 Sep 2017 19:40:20 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id u136so2994218pgc.0 for ; Thu, 28 Sep 2017 12:40:20 -0700 (PDT) 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 :content-transfer-encoding; bh=n2w76J1g5mAitk5Eh0qDLKkOzNFUu2tBsjmJX0PNH7A=; b=pl7UmCVlCJ5KHSvS2BAxA2JhD9I2wNOdrp1N6IcO/qRILBWTRjaJLltQ/wWegYvkLp edsPkJdZ+LebnrItL2vPYnwTn0dspIxT98BByFaAJcOI4V0o06QWWeVQrHdSf1BCxTdl 1v4c75HRp7vHqrUyIYnfpIrvbHTjm+8PZD40AsTYaNFftF5gK5jy3KA6JgYt1gJsSkx1 jwJPVl6SBiTXM7dxBfHYXwFkzt6wZrbi1lFYUJXcpcvTq7X84Fp2co7r2Ko0+0y9NPVf U961Y76mj5Q9jqlfcWFMKG0lT0oKbxF3DmYhNYAQKMLPb/ZLEJ82SkNbLtvhHBD8DXPl Z3rg== X-Gm-Message-State: AHPjjUhC7LbP5JqNsbArTASbeFQgt+taaSjp+Pf5r/tC9CDk6n5mYONZ fHzLK8qDh/P+uZ2IqmTWZyEBCA== X-Google-Smtp-Source: AOwi7QCHbNnr9K7qMJvsSeR1WGi/RnrC6hPSJBSOxy9bFD/mlA/k0Ux3EK2NspiT9MOV6+alCE9lIQ== X-Received: by 10.99.116.90 with SMTP id e26mr5102714pgn.290.1506627620334; Thu, 28 Sep 2017 12:40:20 -0700 (PDT) Received: from centos.eng.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id v31sm3707193pgn.43.2017.09.28.12.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Sep 2017 12:40:19 -0700 (PDT) From: Andy Zhou To: dev@openvswitch.org Date: Thu, 28 Sep 2017 12:39:35 -0700 Message-Id: <1506627575-2875-1-git-send-email-azhou@ovn.org> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=0.5 required=5.0 tests=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] dpif-netdev: Use portable error code for zero rate meter band 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 'EBADRQC' is only defined on the Linux platform. Without this fix, The travis MacOS build fails. Switching to using EDOM which is more portable. Fixes: 2029ce9ac3a601 (dpif-netdev: Fix a zero-rate bug for meter) CC: Ali Volkan ATLI Signed-off-by: Andy Zhou Acked-by: Joe Stringer --- lib/dpif-netdev.c | 2 +- ofproto/ofproto-dpif.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 0fce94e0e409..d5eb8305c8a2 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -4285,7 +4285,7 @@ dpif_netdev_meter_set(struct dpif *dpif, ofproto_meter_id *meter_id, /* Validate rates */ for (i = 0; i < config->n_bands; i++) { if (config->bands[i].rate == 0) { - return EBADRQC; /* rate must be non-zero */ + return EDOM; /* rate must be non-zero */ } } diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index d99dc9d88788..43d670a15c3f 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -5695,7 +5695,7 @@ meter_set(struct ofproto *ofproto_, ofproto_meter_id *meter_id, return OFPERR_OFPMMFC_OUT_OF_BANDS; case ENODEV: /* Unsupported band type */ return OFPERR_OFPMMFC_BAD_BAND; - case EBADRQC: /* Rate must be non-zero */ + case EDOM: /* Rate must be non-zero */ return OFPERR_OFPMMFC_BAD_RATE; default: return OFPERR_OFPMMFC_UNKNOWN;