From patchwork Tue May 5 15:51:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas F Herbert X-Patchwork-Id: 468270 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 BD19914075A for ; Wed, 6 May 2015 03:38:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=i1FAUW4H; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759049AbbEEQGo (ORCPT ); Tue, 5 May 2015 12:06:44 -0400 Received: from mail-vn0-f49.google.com ([209.85.216.49]:35927 "EHLO mail-vn0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2993473AbbEEPvu (ORCPT ); Tue, 5 May 2015 11:51:50 -0400 Received: by vnbf62 with SMTP id f62so17260066vnb.3 for ; Tue, 05 May 2015 08:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TpgyP+wuxkTXfVjtNyqm1m4qfR57CzN/upMDS7Q3Ybo=; b=i1FAUW4HH8Nf1rbaHUc5HWRhSzpT+6jL5nMpC55CMzB4YL5aMMCdEWPR3PCw1uUsuA MZu6khLS9QGfuy5rfMuxMgAzo26spGG+W+c/Yidnk0ZWbvqlgsio9WQj3mwex7sfj2A4 fxA/tSe/MUscg2pK2s+nB45DUzSe8GGy0gXE+beTWlEd2F8slyoT8vLgg6zyy4VFuXwq /hJcIAfTAjxnsHwtTgCGI53IJSGLimVI22vi0hWa0cC+UcGX/hSNBe0Pi7RDVvA+gSv1 uUoOUvkaTv0EplqmMBHe5fS0pZRfBk0VXnCTwQ6ggg0griY98N8t+lty254iuKyT2xIE jQ8w== X-Received: by 10.52.240.45 with SMTP id vx13mr31158279vdc.22.1430841109208; Tue, 05 May 2015 08:51:49 -0700 (PDT) Received: from localhost.localdomain (pool-72-84-233-168.rcmdva.fios.verizon.net. [72.84.233.168]) by mx.google.com with ESMTPSA id at6sm8627901vdc.7.2015.05.05.08.51.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 May 2015 08:51:48 -0700 (PDT) From: Thomas F Herbert To: netdev@vger.kernel.org Cc: therbert@redhat.com, ccp@atcnet.net, dev@openvswitch.org, Thomas F Herbert Subject: [PATCH net-next V8 1/2] openvswitch: 802.1ad uapi changes. Date: Tue, 5 May 2015 11:51:26 -0400 Message-Id: <1430841087-20764-2-git-send-email-thomasfherbert@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430841087-20764-1-git-send-email-thomasfherbert@gmail.com> References: <1430841087-20764-1-git-send-email-thomasfherbert@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org openvswitch: Add support for 802.1AD Change the description of the VLAN tpid field. Signed-off-by: Thomas F Herbert --- include/uapi/linux/openvswitch.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index bbd49a0..f2ccdef 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -559,13 +559,13 @@ struct ovs_action_push_mpls { * @vlan_tci: Tag control identifier (TCI) to push. The CFI bit must be set * (but it will not be set in the 802.1Q header that is pushed). * - * The @vlan_tpid value is typically %ETH_P_8021Q. The only acceptable TPID - * values are those that the kernel module also parses as 802.1Q headers, to - * prevent %OVS_ACTION_ATTR_PUSH_VLAN followed by %OVS_ACTION_ATTR_POP_VLAN - * from having surprising results. + * The @vlan_tpid value is typically %ETH_P_8021Q or %ETH_P_8021AD. + * The only acceptable TPID values are those that the kernel module also parses + * as 802.1Q or 802.1AD headers, to prevent %OVS_ACTION_ATTR_PUSH_VLAN followed + * by %OVS_ACTION_ATTR_POP_VLAN from having surprising results. */ struct ovs_action_push_vlan { - __be16 vlan_tpid; /* 802.1Q TPID. */ + __be16 vlan_tpid; /* 802.1Q or 802.1ad TPID. */ __be16 vlan_tci; /* 802.1Q TCI (VLAN ID and priority). */ }; @@ -605,9 +605,10 @@ struct ovs_action_hash { * is copied from the value to the packet header field, rest of the bits are * left unchanged. The non-masked value bits must be passed in as zeroes. * Masking is not supported for the %OVS_KEY_ATTR_TUNNEL attribute. - * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q header onto the - * packet. - * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet. + * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q or 802.1ad header + * onto the packet. + * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q or 802.1ad header + * from the packet. * @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in * the nested %OVS_SAMPLE_ATTR_* attributes. * @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the