From patchwork Mon Feb 6 13:19:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yotam Gigi X-Patchwork-Id: 724494 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 3vH7Kz54h1z9s2G for ; Tue, 7 Feb 2017 00:17:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751473AbdBFNQv (ORCPT ); Mon, 6 Feb 2017 08:16:51 -0500 Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:51769 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750950AbdBFNQu (ORCPT ); Mon, 6 Feb 2017 08:16:50 -0500 Received: from Internal Mail-Server by MTLPINE1 (envelope-from yotamg@mellanox.com) with ESMTPS (AES256-SHA encrypted); 6 Feb 2017 15:16:47 +0200 Received: from dev-r-vrt-156.mtr.labs.mlnx (dev-r-vrt-156.mtr.labs.mlnx [10.212.156.1]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id v16DGlQc001464; Mon, 6 Feb 2017 15:16:47 +0200 From: Yotam Gigi To: netdev@vger.kernel.org, stephen@networkplumber.org, eladr@mellanox.com, idosch@mellanox.com, jiri@mellanox.com, jhs@mojatatu.com, mrv@mojatatu.com Cc: Yotam Gigi Subject: [PATCH net-next/iproute 3/5] tc: bash-completion: Make the *_KIND variables global Date: Mon, 6 Feb 2017 15:19:22 +0200 Message-Id: <1486387164-40404-4-git-send-email-yotamg@mellanox.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1486387164-40404-1-git-send-email-yotamg@mellanox.com> References: <1486387164-40404-1-git-send-email-yotamg@mellanox.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The QDISC_KIND, FILTER_KIND, ACTION_KIND variables may be used by other routines, thus make them global variables. Signed-off-by: Yotam Gigi --- bash-completion/tc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/bash-completion/tc b/bash-completion/tc index c854dc0..e23f69c 100644 --- a/bash-completion/tc +++ b/bash-completion/tc @@ -2,6 +2,12 @@ # Copyright 2016 6WIND S.A. # Copyright 2016 Quentin Monnet +QDISC_KIND=' choke codel bfifo pfifo pfifo_head_drop fq fq_codel gred hhf \ + mqprio multiq netem pfifo_fast pie red rr sfb sfq tbf atm cbq drr \ + dsmark hfsc htb prio qfq ' +FILTER_KIND=' basic bpf cgroup flow flower fw route rsvp tcindex u32 ' +ACTION_KIND=' gact mirred bpf sample ' + # Takes a list of words in argument; each one of them is added to COMPREPLY if # it is not already present on the command line. Returns no value. _tc_once_attr() @@ -605,10 +611,7 @@ _tc() COMPREPLY=( $( compgen -W 'dev' -- "$cur" ) ) return 0 fi - local qdisc qdwd QDISC_KIND=' choke codel bfifo pfifo \ - pfifo_head_drop fq fq_codel gred hhf mqprio multiq \ - netem pfifo_fast pie red rr sfb sfq tbf atm cbq drr \ - dsmark hfsc htb prio qfq ' + local qdisc qdwd for ((qdwd=$subcword; qdwd < ${#words[@]}-1; qdwd++)); do if [[ $QDISC_KIND =~ ' '${words[qdwd]}' ' ]]; then qdisc=${words[qdwd]} @@ -643,10 +646,7 @@ _tc() COMPREPLY=( $( compgen -W 'dev' -- "$cur" ) ) return 0 fi - local qdisc qdwd QDISC_KIND=' choke codel bfifo pfifo \ - pfifo_head_drop fq fq_codel gred hhf mqprio multiq \ - netem pfifo_fast pie red rr sfb sfq tbf atm cbq drr \ - dsmark hfsc htb prio qfq ' + local qdisc qdwd for ((qdwd=$subcword; qdwd < ${#words[@]}-1; qdwd++)); do if [[ $QDISC_KIND =~ ' '${words[qdwd]}' ' ]]; then qdisc=${words[qdwd]} @@ -681,8 +681,7 @@ _tc() COMPREPLY=( $( compgen -W 'dev' -- "$cur" ) ) return 0 fi - local filter fltwd FILTER_KIND=' basic bpf cgroup flow \ - flower fw route rsvp tcindex u32 ' + local filter fltwd for ((fltwd=$subcword; fltwd < ${#words[@]}-1; fltwd++)); do if [[ $FILTER_KIND =~ ' '${words[fltwd]}' ' ]]; then @@ -714,7 +713,7 @@ _tc() action) case $subcmd in add|change|replace) - local action acwd ACTION_KIND=' gact mirred bpf sample ' + local action acwd for ((acwd=$subcword; acwd < ${#words[@]}-1; acwd++)); do if [[ $ACTION_KIND =~ ' '${words[acwd]}' ' ]]; then _tc_action_options $acwd && return 0