rtl88x2CE_WiFi_linux add concurrent mode

hc

2024-09-20 cf4ce59b3b70238352c7f1729f0f7223214828ad

 kernel/include/rdma/opa_vnic.h
..
..
@@ -1,51 +1,10 @@
1
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
2
+/*
3
+ * Copyright(c) 2017 - 2020 Intel Corporation.
4
+ */
5
+
1
6
 #ifndef _OPA_VNIC_H
2
7
 #define _OPA_VNIC_H
3
-/*
4
- * Copyright(c) 2017 Intel Corporation.
5
- *
6
- * This file is provided under a dual BSD/GPLv2 license.  When using or
7
- * redistributing this file, you may do so under either license.
8
- *
9
- * GPL LICENSE SUMMARY
10
- *
11
- * This program is free software; you can redistribute it and/or modify
12
- * it under the terms of version 2 of the GNU General Public License as
13
- * published by the Free Software Foundation.
14
- *
15
- * This program is distributed in the hope that it will be useful, but
16
- * WITHOUT ANY WARRANTY; without even the implied warranty of
17
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
18
- * General Public License for more details.
19
- *
20
- * BSD LICENSE
21
- *
22
- * Redistribution and use in source and binary forms, with or without
23
- * modification, are permitted provided that the following conditions
24
- * are met:
25
- *
26
- *  - Redistributions of source code must retain the above copyright
27
- *    notice, this list of conditions and the following disclaimer.
28
- *  - Redistributions in binary form must reproduce the above copyright
29
- *    notice, this list of conditions and the following disclaimer in
30
- *    the documentation and/or other materials provided with the
31
- *    distribution.
32
- *  - Neither the name of Intel Corporation nor the names of its
33
- *    contributors may be used to endorse or promote products derived
34
- *    from this software without specific prior written permission.
35
- *
36
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
37
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
38
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
39
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
40
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
41
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
42
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
43
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
44
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
45
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
46
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
47
- *
48
- */
49
8
 
50
9
 /*
51
10
  * This file contains Intel Omni-Path (OPA) Virtual Network Interface
..
..
@@ -75,7 +34,7 @@
75
34
 struct opa_vnic_rdma_netdev {
76
35
 	struct rdma_netdev rn;  /* keep this first */
77
36
 	/* followed by device private data */
78
-	char *dev_priv[0];
37
+	char *dev_priv[];
79
38
 };
80
39
 
81
40
 static inline void *opa_vnic_priv(const struct net_device *dev)
..
..
@@ -132,7 +91,7 @@
132
91
 static inline bool rdma_cap_opa_vnic(struct ib_device *device)
133
92
 {
134
93
 	return !!(device->attrs.device_cap_flags &
135
-		  IB_DEVICE_RDMA_NETDEV_OPA_VNIC);
94
+		  IB_DEVICE_RDMA_NETDEV_OPA);
136
95
 }
137
96
 
138
97
 #endif /* _OPA_VNIC_H */