Message ID | 1491408565-21606-1-git-send-email-ogerlitz@mellanox.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, Apr 05, 2017 at 07:09:25PM +0300, Or Gerlitz wrote: > Commit c7e2b9689ef "sched: introduce vlan action" added both the > UAPI values for the vlan actions (TCA_VLAN_ACT_) and these two > in-kernel ones which are not used, remove them. > > Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> > Acked-by: Jiri Pirko <jiri@mellanox.com> Reviewed-by: Simon Horman <simon.horman@netronome.com>
From: Or Gerlitz <ogerlitz@mellanox.com> Date: Wed, 5 Apr 2017 19:09:25 +0300 > Commit c7e2b9689ef "sched: introduce vlan action" added both the > UAPI values for the vlan actions (TCA_VLAN_ACT_) and these two > in-kernel ones which are not used, remove them. > > Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> > Acked-by: Jiri Pirko <jiri@mellanox.com> Applied.
diff --git a/include/net/tc_act/tc_vlan.h b/include/net/tc_act/tc_vlan.h index 9690c04..c2090df 100644 --- a/include/net/tc_act/tc_vlan.h +++ b/include/net/tc_act/tc_vlan.h @@ -13,9 +13,6 @@ #include <net/act_api.h> #include <linux/tc_act/tc_vlan.h> -#define VLAN_F_POP 0x1 -#define VLAN_F_PUSH 0x2 - struct tcf_vlan { struct tc_action common; int tcfv_action;