From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jianbo Liu Subject: [PATCH net-next 2/5] net/sched: flower: Add support for matching on vlan ethertype Date: Sat, 30 Jun 2018 09:53:14 +0000 Message-ID: <20180630095317.5691-3-jianbol@mellanox.com> References: <20180630095317.5691-1-jianbol@mellanox.com> Cc: Jianbo Liu , Jamal Hadi Salim , Cong Wang To: netdev@vger.kernel.org, davem@davemloft.net, jiri@resnulli.us Return-path: Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:36801 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934577AbeF3JyA (ORCPT ); Sat, 30 Jun 2018 05:54:00 -0400 In-Reply-To: <20180630095317.5691-1-jianbol@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: As flow dissector stores vlan ethertype, tc flower now can match on that. It is to make preparation for supporting QinQ. Signed-off-by: Jianbo Liu Acked-by: Jiri Pirko --- net/sched/cls_flower.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 4e74508..e6774af 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -483,6 +483,7 @@ static int fl_set_key_mpls(struct nlattr **tb, } static void fl_set_key_vlan(struct nlattr **tb, + __be16 ethertype, struct flow_dissector_key_vlan *key_val, struct flow_dissector_key_vlan *key_mask) { @@ -499,6 +500,8 @@ static void fl_set_key_vlan(struct nlattr **tb, VLAN_PRIORITY_MASK; key_mask->vlan_priority = VLAN_PRIORITY_MASK; } + key_val->vlan_tpid = ethertype; + key_mask->vlan_tpid = cpu_to_be16(~0); } static void fl_set_key_flag(u32 flower_key, u32 flower_mask, @@ -575,8 +578,8 @@ static int fl_set_key(struct net *net, struct nlattr **tb, if (tb[TCA_FLOWER_KEY_ETH_TYPE]) { ethertype = nla_get_be16(tb[TCA_FLOWER_KEY_ETH_TYPE]); - if (ethertype == htons(ETH_P_8021Q)) { - fl_set_key_vlan(tb, &key->vlan, &mask->vlan); + if (eth_type_vlan(ethertype)) { + fl_set_key_vlan(tb, ethertype, &key->vlan, &mask->vlan); fl_set_key_val(tb, &key->basic.n_proto, TCA_FLOWER_KEY_VLAN_ETH_TYPE, &mask->basic.n_proto, TCA_FLOWER_UNSPEC, -- 2.9.5