update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/net/wireless/intersil/hostap/hostap_proc.c
..
..
@@ -149,6 +149,7 @@
149
149
 }
150
150
 
151
151
 static void *prism2_bss_list_proc_start(struct seq_file *m, loff_t *_pos)
152
+	__acquires(&local->lock)
152
153
 {
153
154
 	local_info_t *local = PDE_DATA(file_inode(m->file));
154
155
 	spin_lock_bh(&local->lock);
..
..
@@ -162,6 +163,7 @@
162
163
 }
163
164
 
164
165
 static void prism2_bss_list_proc_stop(struct seq_file *m, void *v)
166
+	__releases(&local->lock)
165
167
 {
166
168
 	local_info_t *local = PDE_DATA(file_inode(m->file));
167
169
 	spin_unlock_bh(&local->lock);
..
..
@@ -211,9 +213,9 @@
211
213
 	return count;
212
214
 }
213
215
 
214
-static const struct file_operations prism2_pda_proc_fops = {
215
-	.read		= prism2_pda_proc_read,
216
-	.llseek		= generic_file_llseek,
216
+static const struct proc_ops prism2_pda_proc_ops = {
217
+	.proc_read	= prism2_pda_proc_read,
218
+	.proc_lseek	= generic_file_llseek,
217
219
 };
218
220
 
219
221
 
..
..
@@ -223,8 +225,8 @@
223
225
 	return 0;
224
226
 }
225
227
 
226
-static const struct file_operations prism2_aux_dump_proc_fops = {
227
-	.read		= prism2_aux_dump_proc_no_read,
228
+static const struct proc_ops prism2_aux_dump_proc_ops = {
229
+	.proc_read	= prism2_aux_dump_proc_no_read,
228
230
 };
229
231
 
230
232
 
..
..
@@ -234,7 +236,7 @@
234
236
 {
235
237
 	local_info_t *local = (local_info_t *) data;
236
238
 	int head = local->io_debug_head;
237
-	int start_bytes, left, copy, copied;
239
+	int start_bytes, left, copy;
238
240
 
239
241
 	if (off + count > PRISM2_IO_DEBUG_SIZE * 4) {
240
242
 		*eof = 1;
..
..
@@ -243,7 +245,6 @@
243
245
 		count = PRISM2_IO_DEBUG_SIZE * 4 - off;
244
246
 	}
245
247
 
246
-	copied = 0;
247
248
 	start_bytes = (PRISM2_IO_DEBUG_SIZE - head) * 4;
248
249
 	left = count;
249
250
 
..
..
@@ -380,9 +381,9 @@
380
381
 	proc_create_seq_data("wds", 0, local->proc,
381
382
 			&prism2_wds_proc_seqops, local);
382
383
 	proc_create_data("pda", 0, local->proc,
383
-			 &prism2_pda_proc_fops, local);
384
+			 &prism2_pda_proc_ops, local);
384
385
 	proc_create_data("aux_dump", 0, local->proc,
385
-			 local->func->read_aux_fops ?: &prism2_aux_dump_proc_fops,
386
+			 local->func->read_aux_proc_ops ?: &prism2_aux_dump_proc_ops,
386
387
 			 local);
387
388
 	proc_create_seq_data("bss_list", 0, local->proc,
388
389
 			&prism2_bss_list_proc_seqops, local);