diff options
| author | David Ahern <dsahern@gmail.com> | 2018-03-13 17:48:10 -0700 |
|---|---|---|
| committer | David Ahern <dsahern@gmail.com> | 2018-03-13 17:48:10 -0700 |
| commit | e9625d6aead11c7ca8b64af3ad06ea451e06ea9e (patch) | |
| tree | f2736bbf90ddc7b633195385904bd4e3dde8ef52 /tc/m_vlan.c | |
| parent | a121129df91104ade8f51ac9ccd6e3a84bbddf27 (diff) | |
| parent | 527f85141c9e6982f73f043f85949eaf7ff498bc (diff) | |
Merge branch 'iproute2-master' into iproute2-next
Conflicts:
bridge/mdb.c
Updated bridge/bridge.c per removal of check_if_color_enabled by commit
1ca4341d2c6b ("color: disable color when json output is requested")
Signed-off-by: David Ahern <dsahern@gmail.com>
Diffstat (limited to 'tc/m_vlan.c')
| -rw-r--r-- | tc/m_vlan.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tc/m_vlan.c b/tc/m_vlan.c index 9ee52da2..412f6aa1 100644 --- a/tc/m_vlan.c +++ b/tc/m_vlan.c @@ -131,7 +131,6 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p, parse_action_control_dflt(&argc, &argv, &parm.action, false, TC_ACT_PIPE); - NEXT_ARG_FWD(); if (argc) { if (matches(*argv, "index") == 0) { NEXT_ARG(); |