From: David S. Miller Date: Thu, 22 Sep 2016 05:34:26 +0000 (-0400) Subject: Merge branch 'vlan_act_modify' X-Git-Tag: v4.9-rc1~127^2~115 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=1fbafcb84747d0784fe928bedc4189f47d18ad8f;p=karo-tx-linux.git Merge branch 'vlan_act_modify' Shmulik Ladkani says: ==================== act_vlan: Introduce TCA_VLAN_ACT_MODIFY vlan action TCA_VLAN_ACT_MODIFY allows one to change an existing tag. It accepts same attributes as TCA_VLAN_ACT_PUSH (protocol, id, priority). If packet is vlan tagged, then the tag gets overwritten according to user specified attributes. For example, this allows user to replace a tag's vid while preserving its priority bits (as opposed to "action vlan pop pipe action vlan push"). ==================== Signed-off-by: David S. Miller --- 1fbafcb84747d0784fe928bedc4189f47d18ad8f