enable tun/tap/iptables

hc

2024-05-10 ee930fffee469d076998274a2ca55e13dc1efb67

 kernel/include/net/tc_act/tc_vlan.h
..
..
@@ -1,10 +1,6 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  * Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License as published by
6
- * the Free Software Foundation; either version 2 of the License, or
7
- * (at your option) any later version.
8
4
  */
9
5
 
10
6
 #ifndef __NET_TC_VLAN_H
..
..
@@ -15,9 +11,12 @@
15
11
 
16
12
 struct tcf_vlan_params {
17
13
 	int               tcfv_action;
14
+	unsigned char     tcfv_push_dst[ETH_ALEN];
15
+	unsigned char     tcfv_push_src[ETH_ALEN];
18
16
 	u16               tcfv_push_vid;
19
17
 	__be16            tcfv_push_proto;
20
18
 	u8                tcfv_push_prio;
19
+	bool              tcfv_push_prio_exists;
21
20
 	struct rcu_head   rcu;
22
21
 };
23
22
 
..
..
@@ -30,7 +29,7 @@
30
29
 static inline bool is_tcf_vlan(const struct tc_action *a)
31
30
 {
32
31
 #ifdef CONFIG_NET_CLS_ACT
33
-	if (a->ops && a->ops->type == TCA_ACT_VLAN)
32
+	if (a->ops && a->ops->id == TCA_ID_VLAN)
34
33
 		return true;
35
34
 #endif
36
35
 	return false;