forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376 
 kernel/drivers/net/ethernet/qlogic/qed/qed_ooo.c
....@@ -1,33 +1,7 @@
1
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
12 /* QLogic qed NIC Driver
23  * Copyright (c) 2015-2017  QLogic Corporation
3
- *
4
- * This software is available to you under a choice of one of two
5
- * licenses.  You may choose to be licensed under the terms of the GNU
6
- * General Public License (GPL) Version 2, available from the file
7
- * COPYING in the main directory of this source tree, or the
8
- * OpenIB.org BSD license below:
9
- *
10
- *     Redistribution and use in source and binary forms, with or
11
- *     without modification, are permitted provided that the following
12
- *     conditions are met:
13
- *
14
- *      - Redistributions of source code must retain the above
15
- *        copyright notice, this list of conditions and the following
16
- *        disclaimer.
17
- *
18
- *      - Redistributions in binary form must reproduce the above
19
- *        copyright notice, this list of conditions and the following
20
- *        disclaimer in the documentation and /or other materials
21
- *        provided with the distribution.
22
- *
23
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
24
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
25
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
26
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
27
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
28
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
29
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
30
- * SOFTWARE.
4
+ * Copyright (c) 2019-2020 Marvell International Ltd.
315  */
326 
337 #include <linux/types.h>
....@@ -211,9 +185,8 @@
211185 			if (!p_buffer)
212186 				break;
213187 
214
-			list_del(&p_buffer->list_entry);
215
-			list_add_tail(&p_buffer->list_entry,
216
-				      &p_ooo_info->free_buffers_list);
188
+			list_move_tail(&p_buffer->list_entry,
189
+				       &p_ooo_info->free_buffers_list);
217190 		}
218191 		list_add_tail(&p_isle->list_entry,
219192 			      &p_ooo_info->free_isles_list);
....@@ -247,9 +220,8 @@
247220 				if (!p_buffer)
248221 					break;
249222 
250
-			list_del(&p_buffer->list_entry);
251
-				list_add_tail(&p_buffer->list_entry,
252
-					      &p_ooo_info->free_buffers_list);
223
+				list_move_tail(&p_buffer->list_entry,
224
+					       &p_ooo_info->free_buffers_list);
253225 			}
254226 			list_add_tail(&p_isle->list_entry,
255227 				      &p_ooo_info->free_isles_list);
....@@ -353,11 +325,9 @@
353325 			  struct qed_ooo_info *p_ooo_info,
354326 			  u32 cid, u8 drop_isle, u8 drop_size)
355327 {
356
-	struct qed_ooo_archipelago *p_archipelago = NULL;
357328 	struct qed_ooo_isle *p_isle = NULL;
358329 	u8 isle_idx;
359330 
360
-	p_archipelago = qed_ooo_seek_archipelago(p_hwfn, p_ooo_info, cid);
361331 	for (isle_idx = 0; isle_idx < drop_size; isle_idx++) {
362332 		p_isle = qed_ooo_seek_isle(p_hwfn, p_ooo_info, cid, drop_isle);
363333 		if (!p_isle) {
....@@ -462,7 +432,6 @@
462432 void qed_ooo_join_isles(struct qed_hwfn *p_hwfn,
463433 			struct qed_ooo_info *p_ooo_info, u32 cid, u8 left_isle)
464434 {
465
-	struct qed_ooo_archipelago *p_archipelago = NULL;
466435 	struct qed_ooo_isle *p_right_isle = NULL;
467436 	struct qed_ooo_isle *p_left_isle = NULL;
468437 
....@@ -475,7 +444,6 @@
475444 		return;
476445 	}
477446 
478
-	p_archipelago = qed_ooo_seek_archipelago(p_hwfn, p_ooo_info, cid);
479447 	list_del(&p_right_isle->list_entry);
480448 	p_ooo_info->cur_isles_number--;
481449 	if (left_isle) {