summaryrefslogtreecommitdiff
path: root/net/sched
diff options
context:
space:
mode:
authorBoris Sukholitko <boris.sukholitko@broadcom.com>2021-06-01 15:30:51 +0300
committerDavid S. Miller <davem@davemloft.net>2021-06-02 02:54:42 +0300
commit8323b20f1d76b10fb413daae6abf76b7b903c8de (patch)
treedf9c34453403a36d99fe428b72bf98f73dda72f3 /net/sched
parent9c5eee0afca09cbde6bd00f77876754aaa552970 (diff)
downloadlinux-8323b20f1d76b10fb413daae6abf76b7b903c8de.tar.xz
net/sched: act_vlan: No dump for unset priority
Dump vlan priority only if it has been previously set. Fix the tests accordingly. Signed-off-by: Boris Sukholitko <boris.sukholitko@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/act_vlan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/act_vlan.c b/net/sched/act_vlan.c
index a108469c664f..71f2015c70ca 100644
--- a/net/sched/act_vlan.c
+++ b/net/sched/act_vlan.c
@@ -307,8 +307,8 @@ static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a,
(nla_put_u16(skb, TCA_VLAN_PUSH_VLAN_ID, p->tcfv_push_vid) ||
nla_put_be16(skb, TCA_VLAN_PUSH_VLAN_PROTOCOL,
p->tcfv_push_proto) ||
- (nla_put_u8(skb, TCA_VLAN_PUSH_VLAN_PRIORITY,
- p->tcfv_push_prio))))
+ (p->tcfv_push_prio_exists &&
+ nla_put_u8(skb, TCA_VLAN_PUSH_VLAN_PRIORITY, p->tcfv_push_prio))))
goto nla_put_failure;
if (p->tcfv_action == TCA_VLAN_ACT_PUSH_ETH) {