change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/include/rdma/ib_sa.h
..
..
@@ -1,35 +1,8 @@
1
+/* SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB */
1
2
 /*
2
3
  * Copyright (c) 2004 Topspin Communications.  All rights reserved.
3
4
  * Copyright (c) 2005 Voltaire, Inc.  All rights reserved.
4
5
  * Copyright (c) 2006 Intel Corporation.  All rights reserved.
5
- *
6
- * This software is available to you under a choice of one of two
7
- * licenses.  You may choose to be licensed under the terms of the GNU
8
- * General Public License (GPL) Version 2, available from the file
9
- * COPYING in the main directory of this source tree, or the
10
- * OpenIB.org BSD license below:
11
- *
12
- *     Redistribution and use in source and binary forms, with or
13
- *     without modification, are permitted provided that the following
14
- *     conditions are met:
15
- *
16
- *      - Redistributions of source code must retain the above
17
- *        copyright notice, this list of conditions and the following
18
- *        disclaimer.
19
- *
20
- *      - Redistributions in binary form must reproduce the above
21
- *        copyright notice, this list of conditions and the following
22
- *        disclaimer in the documentation and/or other materials
23
- *        provided with the distribution.
24
- *
25
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
26
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
27
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
28
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
29
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
30
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
31
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
32
- * SOFTWARE.
33
6
  */
34
7
 
35
8
 #ifndef IB_SA_H
..
..
@@ -449,28 +422,23 @@
449
422
 
450
423
 void ib_sa_cancel_query(int id, struct ib_sa_query *query);
451
424
 
452
-int ib_sa_path_rec_get(struct ib_sa_client *client,
453
-		       struct ib_device *device, u8 port_num,
454
-		       struct sa_path_rec *rec,
455
-		       ib_sa_comp_mask comp_mask,
456
-		       int timeout_ms, gfp_t gfp_mask,
457
-		       void (*callback)(int status,
458
-					struct sa_path_rec *resp,
425
+int ib_sa_path_rec_get(struct ib_sa_client *client, struct ib_device *device,
426
+		       u8 port_num, struct sa_path_rec *rec,
427
+		       ib_sa_comp_mask comp_mask, unsigned long timeout_ms,
428
+		       gfp_t gfp_mask,
429
+		       void (*callback)(int status, struct sa_path_rec *resp,
459
430
 					void *context),
460
-		       void *context,
461
-		       struct ib_sa_query **query);
431
+		       void *context, struct ib_sa_query **query);
462
432
 
463
433
 int ib_sa_service_rec_query(struct ib_sa_client *client,
464
-			 struct ib_device *device, u8 port_num,
465
-			 u8 method,
466
-			 struct ib_sa_service_rec *rec,
467
-			 ib_sa_comp_mask comp_mask,
468
-			 int timeout_ms, gfp_t gfp_mask,
469
-			 void (*callback)(int status,
470
-					  struct ib_sa_service_rec *resp,
471
-					  void *context),
472
-			 void *context,
473
-			 struct ib_sa_query **sa_query);
434
+			    struct ib_device *device, u8 port_num, u8 method,
435
+			    struct ib_sa_service_rec *rec,
436
+			    ib_sa_comp_mask comp_mask, unsigned long timeout_ms,
437
+			    gfp_t gfp_mask,
438
+			    void (*callback)(int status,
439
+					     struct ib_sa_service_rec *resp,
440
+					     void *context),
441
+			    void *context, struct ib_sa_query **sa_query);
474
442
 
475
443
 struct ib_sa_multicast {
476
444
 	struct ib_sa_mcmember_rec rec;
..
..
@@ -573,12 +541,11 @@
573
541
 			      struct ib_device *device, u8 port_num,
574
542
 			      struct ib_sa_guidinfo_rec *rec,
575
543
 			      ib_sa_comp_mask comp_mask, u8 method,
576
-			      int timeout_ms, gfp_t gfp_mask,
544
+			      unsigned long timeout_ms, gfp_t gfp_mask,
577
545
 			      void (*callback)(int status,
578
546
 					       struct ib_sa_guidinfo_rec *resp,
579
547
 					       void *context),
580
-			      void *context,
581
-			      struct ib_sa_query **sa_query);
548
+			      void *context, struct ib_sa_query **sa_query);
582
549
 
583
550
 bool ib_sa_sendonly_fullmem_support(struct ib_sa_client *client,
584
551
 				    struct ib_device *device,