From patchwork Wed Sep 30 06:44:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 524165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 4C5301402B6 for ; Wed, 30 Sep 2015 16:45:11 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 986E310AF0; Tue, 29 Sep 2015 23:45:10 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 51B75108ED for ; Tue, 29 Sep 2015 23:45:09 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id BF4A64203AC for ; Wed, 30 Sep 2015 00:45:08 -0600 (MDT) X-ASG-Debug-ID: 1443595507-09eadd11e070d270001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id fVyQajXcxzAYz2If (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 30 Sep 2015 00:45:08 -0600 (MDT) X-Barracuda-Envelope-From: simon.horman@netronome.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mail-pa0-f42.google.com) (209.85.220.42) by mx1-pf2.cudamail.com with ESMTPS (RC4-SHA encrypted); 30 Sep 2015 06:45:07 -0000 Received-SPF: none (mx1-pf2.cudamail.com: domain at netronome.com does not designate permitted sender hosts) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.42 Received: by pacfv12 with SMTP id fv12so31553877pac.2 for ; Tue, 29 Sep 2015 23:45:07 -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; bh=cOrsKm/hUS6Zll6mFaGvn7UGJD7gT5cv34tIAJwxvbk=; b=OG6Tz5xdGEa8GPN+fijUFHdPqPdbhzKDB8NolAhrEEWrQycOdo9sIPqPgDdY+jCRUd ZHLKMne7vxhggBa/xMDaz9QeNkk15bw4TNb/w6tI0oAbNVhjQ0VBSF6oKhI4ZSSweVO2 VdWHcdUzs2EjJ+2UFca1O/WIN9P5iB7P9E1fE5THIlPwDNfzG2s5kRGkJfadEG/xwkKK TsVrZemneceQEzABk/meCxWKqD/3rh46qzDzrvzYFoSh4VvwG0A/hPkVL71tAzShdDAb RL1lJnB8eE4LAvMTSwoZuahsKhpst8udrxOkNJMxTA0qCaO3JN7JTKiAPFaVKcY0Luu5 v+ZA== X-Gm-Message-State: ALoCoQmOwJ4SH5VEypuAkUflNr2AWvyQyU76qzFUriXltqu81xo5PcNPDYTJTkwPYx6775+mpIC7 X-Received: by 10.68.185.132 with SMTP id fc4mr2911140pbc.96.1443595506984; Tue, 29 Sep 2015 23:45:06 -0700 (PDT) Received: from reginn.isobedori.kobe.vergenet.net (p4119-ipbfp1002kobeminato.hyogo.ocn.ne.jp. [122.22.70.119]) by smtp.gmail.com with ESMTPSA id xm9sm29336725pbc.32.2015.09.29.23.45.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Sep 2015 23:45:05 -0700 (PDT) X-CudaMail-Envelope-Sender: simon.horman@netronome.com X-Barracuda-Apparent-Source-IP: 122.22.70.119 From: Simon Horman To: dev@openvswitch.org X-CudaMail-MID: CM-E2-929000956 X-CudaMail-DTE: 093015 X-CudaMail-Originating-IP: 209.85.220.42 Date: Wed, 30 Sep 2015 15:44:53 +0900 X-ASG-Orig-Subj: [##CM-E2-929000956##][PATCH v2] Correct Netronome Vendor Id Message-Id: <1443595493-17902-1-git-send-email-simon.horman@netronome.com> X-Mailer: git-send-email 2.1.4 X-GBUdb-Analysis: 0, 209.85.220.42, Ugly c=0.49838 p=-0.52381 Source Normal X-MessageSniffer-Rules: 0-0-0-6279-c X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1443595508 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 1.10 X-Barracuda-Spam-Status: No, SCORE=1.10 using per-user scores of TAG_LEVEL=3.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=3.0 tests=BSF_RULE7568M, BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.23036 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Cc: Simon Horman Subject: [ovs-dev] [PATCH v2] Correct Netronome Vendor Id X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Due to an error on my part the Netronome vendor Id is incorrect: the last digit should be 'D' rather than '0' as per the Netronome IEEE OUI. Signed-off-by: Simon Horman --- * Compile tested only * This problem is also present in the branch-2.4, please consider applying it there too v2 * Provide backwards compatibility via NTR_COMPAT_VENDOR_ID --- Documentation/group-selection-method-property.txt | 2 +- include/openflow/openflow-common.h | 3 ++- lib/ofp-util.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/group-selection-method-property.txt b/Documentation/group-selection-method-property.txt index 36337c6b5aea..f9ebe4aa021f 100644 --- a/Documentation/group-selection-method-property.txt +++ b/Documentation/group-selection-method-property.txt @@ -47,7 +47,7 @@ allows controllers to: The Experimenter ID of this extension is: -NTR_VENDOR_ID = 0x00001540 +NTR_VENDOR_ID = 0x0000154D 4. Group Experimenter Property diff --git a/include/openflow/openflow-common.h b/include/openflow/openflow-common.h index c0d22820acdb..54535dfe9b3f 100644 --- a/include/openflow/openflow-common.h +++ b/include/openflow/openflow-common.h @@ -103,7 +103,8 @@ enum ofp_version { */ #define OF_VENDOR_ID 0 #define HPL_VENDOR_ID 0x000004EA /* HP Labs. */ -#define NTR_VENDOR_ID 0x00001540 /* Netronome. */ +#define NTR_VENDOR_ID 0x0000154D /* Netronome. */ +#define NTR_COMPAT_VENDOR_ID 0x00001540 /* Incorrect value used in v2.4. */ #define NX_VENDOR_ID 0x00002320 /* Nicira. */ #define ONF_VENDOR_ID 0x4f4e4600 /* Open Networking Foundation. */ diff --git a/lib/ofp-util.c b/lib/ofp-util.c index d90cca894bef..b9dbcdaeec5a 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -8191,6 +8191,7 @@ parse_ofp15_group_prop_exp(struct ofpbuf *payload, switch (experimenter) { case NTR_VENDOR_ID: + case NTR_COMPAT_VENDOR_ID: error = parse_group_prop_ntr(payload, exp_type, group_type, group_cmd, gp); break;