@@ -1617,23 +1617,23 @@ static int fl_set_key(struct net *net, struct nlattr **tb,
1617
1617
sizeof (key -> eth .src ));
1618
1618
1619
1619
if (is_vlan_key (tb [TCA_FLOWER_KEY_ETH_TYPE ], & ethertype , key , mask )) {
1620
- fl_set_key_vlan (tb , ethertype , TCA_FLOWER_KEY_VLAN_ID ,
1621
- TCA_FLOWER_KEY_VLAN_PRIO ,
1622
- TCA_FLOWER_KEY_VLAN_ETH_TYPE ,
1623
- & key -> vlan , & mask -> vlan );
1624
-
1625
- if (is_vlan_key (tb [TCA_FLOWER_KEY_VLAN_ETH_TYPE ], & ethertype , key , mask )) {
1626
- fl_set_key_vlan (tb , ethertype ,
1627
- TCA_FLOWER_KEY_CVLAN_ID ,
1628
- TCA_FLOWER_KEY_CVLAN_PRIO ,
1629
- TCA_FLOWER_KEY_CVLAN_ETH_TYPE ,
1630
- & key -> cvlan , & mask -> cvlan );
1631
- fl_set_key_val (tb , & key -> basic .n_proto ,
1632
- TCA_FLOWER_KEY_CVLAN_ETH_TYPE ,
1633
- & mask -> basic .n_proto ,
1634
- TCA_FLOWER_UNSPEC ,
1635
- sizeof (key -> basic .n_proto ));
1636
- }
1620
+ fl_set_key_vlan (tb , ethertype , TCA_FLOWER_KEY_VLAN_ID ,
1621
+ TCA_FLOWER_KEY_VLAN_PRIO ,
1622
+ TCA_FLOWER_KEY_VLAN_ETH_TYPE ,
1623
+ & key -> vlan , & mask -> vlan );
1624
+
1625
+ if (is_vlan_key (tb [TCA_FLOWER_KEY_VLAN_ETH_TYPE ], & ethertype , key , mask )) {
1626
+ fl_set_key_vlan (tb , ethertype ,
1627
+ TCA_FLOWER_KEY_CVLAN_ID ,
1628
+ TCA_FLOWER_KEY_CVLAN_PRIO ,
1629
+ TCA_FLOWER_KEY_CVLAN_ETH_TYPE ,
1630
+ & key -> cvlan , & mask -> cvlan );
1631
+ fl_set_key_val (tb , & key -> basic .n_proto ,
1632
+ TCA_FLOWER_KEY_CVLAN_ETH_TYPE ,
1633
+ & mask -> basic .n_proto ,
1634
+ TCA_FLOWER_UNSPEC ,
1635
+ sizeof (key -> basic .n_proto ));
1636
+ }
1637
1637
}
1638
1638
1639
1639
if (key -> basic .n_proto == htons (ETH_P_IP ) ||
0 commit comments