From patchwork Fri Feb 15 20:21:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vlad Yasevich X-Patchwork-Id: 220841 X-Patchwork-Delegate: shemminger@vyatta.com 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 49A2C2C0080 for ; Sat, 16 Feb 2013 07:22:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752030Ab3BOUWC (ORCPT ); Fri, 15 Feb 2013 15:22:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44024 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751968Ab3BOUV5 (ORCPT ); Fri, 15 Feb 2013 15:21:57 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1FKLvt9017002 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 15 Feb 2013 15:21:57 -0500 Received: from vyasevic.redhat.com (ovpn-113-136.phx2.redhat.com [10.3.113.136]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r1FKLrEr015351; Fri, 15 Feb 2013 15:21:56 -0500 From: Vlad Yasevich To: netdev@vger.kernel.org Cc: shemminger@vyatta.com Subject: [PATCH iproute 3/3] bridge: Update bridge man pages to include vlan command Date: Fri, 15 Feb 2013 15:21:52 -0500 Message-Id: <1360959712-7977-4-git-send-email-vyasevic@redhat.com> In-Reply-To: <1360959712-7977-1-git-send-email-vyasevic@redhat.com> References: <1360959712-7977-1-git-send-email-vyasevic@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add the vlan command documentation to bridge man page. Signed-off-by: Vlad Yasevich --- man/man8/bridge.8 | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 1 deletions(-) diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 index fd91618..d34e3cf 100644 --- a/man/man8/bridge.8 +++ b/man/man8/bridge.8 @@ -13,7 +13,7 @@ bridge \- show / manipulate bridge addresses and devices .ti -8 .IR OBJECT " := { " -.BR fdb " | " monitor " }" +.BR fdb " | " vlan " | " monitor " }" .sp .ti -8 @@ -35,6 +35,20 @@ bridge \- show / manipulate bridge addresses and devices .IR DEV " ]" .ti -8 +.BR "bridge vlan" " { " add " | " del " } " +.B dev +.IR DEV +.B vid +.IR VID " [ " +.BR pvid " ] [ " untagged " ] [ " +.BR self " ] [ " master " ] " + +.ti -8 +.BR "bridge vlan" " [ " show " ] [ " +.B dev +.IR DEV " ]" + +.ti -8 .BR "bridge monitor" " [ " all " | " neigh " | " link " ]" .SH OPTIONS @@ -61,6 +75,10 @@ As a rule, the information is statistics or some time values. .B fdb - Forwarding Database entry. +.TP +.B vlan +- VLAN filter list. + .SS .I COMMAND @@ -143,6 +161,59 @@ With the option, the command becomes verbose. It prints out the last updated and last used time for each entry. +.SH bridge vlan - VLAN filter list + +.B vlan +objects contain known VLAN IDs for a link. + +.P +The corresponding commands display vlan filter entries, add new entries, +and delete old ones. + +.SS bridge vlan add - add a new vlan filter entry + +This command creates a new vlan filter entry. + +.TP +.BI dev " NAME" +the interface with which this vlan is associated. + +.TP +.BI vid " VID" +the VLAN ID that identifies the vlan. + +.TP +.BI pvid +the vlan specified is to be considered a PVID at ingress. +Any untagged frames will be assigned to this VLAN. + +.TP +.BI untagged +the vlan specified is to be treated as untagged on egress. + +.TP +.BI self +the vlan is configured on the specified physical device. Required if the +device is the bridge device. + +.TP +.BI master +the vlan is configured on the sofware bridge (default). + +.SS bridge vlan delete - delete a forwarding database entry +This command removes an existing fdb entry. + +.PP +The arguments are the same as with +.BR "bridge vlan add". +The +.BR "pvid " and " untagged" +flags are ignored. + +.SS bridge vlan show - list vlan configuration. + +This command displays the current VLAN filter table. + .SH bridge monitor - state monitoring The