From patchwork Fri Nov 27 09:13:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McHardy X-Patchwork-Id: 549354 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EFFE91402E2 for ; Fri, 27 Nov 2015 20:13:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754071AbbK0JNm (ORCPT ); Fri, 27 Nov 2015 04:13:42 -0500 Received: from stinky.trash.net ([213.144.137.162]:44584 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754041AbbK0JNk (ORCPT ); Fri, 27 Nov 2015 04:13:40 -0500 Received: from macbook.localdomain (localhost [127.0.0.1]) by stinky.trash.net (Postfix) with ESMTP id 29B369D2F1; Fri, 27 Nov 2015 10:13:38 +0100 (MET) From: Patrick McHardy To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH nft] proto: fix VLAN header definition Date: Fri, 27 Nov 2015 09:13:34 +0000 Message-Id: <1448615614-16510-1-git-send-email-kaber@trash.net> X-Mailer: git-send-email 2.5.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The VID is located after Priority and CFI. Signed-off-by: Patrick McHardy --- include/proto.h | 4 ++-- src/proto.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/proto.h b/include/proto.h index 974116f..d90bccd 100644 --- a/include/proto.h +++ b/include/proto.h @@ -159,9 +159,9 @@ enum eth_hdr_fields { enum vlan_hdr_fields { VLANHDR_INVALID, - VLANHDR_VID, - VLANHDR_CFI, VLANHDR_PCP, + VLANHDR_CFI, + VLANHDR_VID, VLANHDR_TYPE, }; diff --git a/src/proto.c b/src/proto.c index 0fe0b88..f2cf297 100644 --- a/src/proto.c +++ b/src/proto.c @@ -730,9 +730,9 @@ const struct proto_desc proto_vlan = { }, .templates = { - [VLANHDR_VID] = VLANHDR_BITFIELD("id", 0, 12), - [VLANHDR_CFI] = VLANHDR_BITFIELD("cfi", 12, 1), - [VLANHDR_PCP] = VLANHDR_BITFIELD("pcp", 13, 3), + [VLANHDR_PCP] = VLANHDR_BITFIELD("pcp", 0, 3), + [VLANHDR_CFI] = VLANHDR_BITFIELD("cfi", 3, 1), + [VLANHDR_VID] = VLANHDR_BITFIELD("id", 4, 12), [VLANHDR_TYPE] = VLANHDR_TYPE("type", ðertype_type, vlan_type), }, };