forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c 
 kernel/drivers/staging/wlan-ng/prism2sta.c
....@@ -288,99 +288,93 @@
288288 	int result = 0;
289289 
290290 	switch (msg->msgcode) {
291
-	case DIDmsg_dot11req_mibget:
291
+	case DIDMSG_DOT11REQ_MIBGET:
292292 		pr_debug("Received mibget request\n");
293293 		result = prism2mgmt_mibset_mibget(wlandev, msg);
294294 		break;
295
-	case DIDmsg_dot11req_mibset:
295
+	case DIDMSG_DOT11REQ_MIBSET:
296296 		pr_debug("Received mibset request\n");
297297 		result = prism2mgmt_mibset_mibget(wlandev, msg);
298298 		break;
299
-	case DIDmsg_dot11req_scan:
299
+	case DIDMSG_DOT11REQ_SCAN:
300300 		pr_debug("Received scan request\n");
301301 		result = prism2mgmt_scan(wlandev, msg);
302302 		break;
303
-	case DIDmsg_dot11req_scan_results:
303
+	case DIDMSG_DOT11REQ_SCAN_RESULTS:
304304 		pr_debug("Received scan_results request\n");
305305 		result = prism2mgmt_scan_results(wlandev, msg);
306306 		break;
307
-	case DIDmsg_dot11req_start:
307
+	case DIDMSG_DOT11REQ_START:
308308 		pr_debug("Received mlme start request\n");
309309 		result = prism2mgmt_start(wlandev, msg);
310310 		break;
311311 		/*
312312 		 * Prism2 specific messages
313313 		 */
314
-	case DIDmsg_p2req_readpda:
314
+	case DIDMSG_P2REQ_READPDA:
315315 		pr_debug("Received mlme readpda request\n");
316316 		result = prism2mgmt_readpda(wlandev, msg);
317317 		break;
318
-	case DIDmsg_p2req_ramdl_state:
318
+	case DIDMSG_P2REQ_RAMDL_STATE:
319319 		pr_debug("Received mlme ramdl_state request\n");
320320 		result = prism2mgmt_ramdl_state(wlandev, msg);
321321 		break;
322
-	case DIDmsg_p2req_ramdl_write:
322
+	case DIDMSG_P2REQ_RAMDL_WRITE:
323323 		pr_debug("Received mlme ramdl_write request\n");
324324 		result = prism2mgmt_ramdl_write(wlandev, msg);
325325 		break;
326
-	case DIDmsg_p2req_flashdl_state:
326
+	case DIDMSG_P2REQ_FLASHDL_STATE:
327327 		pr_debug("Received mlme flashdl_state request\n");
328328 		result = prism2mgmt_flashdl_state(wlandev, msg);
329329 		break;
330
-	case DIDmsg_p2req_flashdl_write:
330
+	case DIDMSG_P2REQ_FLASHDL_WRITE:
331331 		pr_debug("Received mlme flashdl_write request\n");
332332 		result = prism2mgmt_flashdl_write(wlandev, msg);
333333 		break;
334334 		/*
335335 		 * Linux specific messages
336336 		 */
337
-	case DIDmsg_lnxreq_hostwep:
337
+	case DIDMSG_LNXREQ_HOSTWEP:
338338 		break;		/* ignore me. */
339
-	case DIDmsg_lnxreq_ifstate:
340
-		{
341
-			struct p80211msg_lnxreq_ifstate *ifstatemsg;
339
+	case DIDMSG_LNXREQ_IFSTATE: {
340
+		struct p80211msg_lnxreq_ifstate *ifstatemsg;
342341 
343
-			pr_debug("Received mlme ifstate request\n");
344
-			ifstatemsg = (struct p80211msg_lnxreq_ifstate *)msg;
345
-			result =
346
-			    prism2sta_ifstate(wlandev,
347
-					      ifstatemsg->ifstate.data);
348
-			ifstatemsg->resultcode.status =
349
-			    P80211ENUM_msgitem_status_data_ok;
350
-			ifstatemsg->resultcode.data = result;
351
-			result = 0;
352
-		}
342
+		pr_debug("Received mlme ifstate request\n");
343
+		ifstatemsg = (struct p80211msg_lnxreq_ifstate *)msg;
344
+		result = prism2sta_ifstate(wlandev,
345
+					   ifstatemsg->ifstate.data);
346
+		ifstatemsg->resultcode.status =
347
+			P80211ENUM_msgitem_status_data_ok;
348
+		ifstatemsg->resultcode.data = result;
349
+		result = 0;
353350 		break;
354
-	case DIDmsg_lnxreq_wlansniff:
351
+	}
352
+	case DIDMSG_LNXREQ_WLANSNIFF:
355353 		pr_debug("Received mlme wlansniff request\n");
356354 		result = prism2mgmt_wlansniff(wlandev, msg);
357355 		break;
358
-	case DIDmsg_lnxreq_autojoin:
356
+	case DIDMSG_LNXREQ_AUTOJOIN:
359357 		pr_debug("Received mlme autojoin request\n");
360358 		result = prism2mgmt_autojoin(wlandev, msg);
361359 		break;
362
-	case DIDmsg_lnxreq_commsquality:{
363
-			struct p80211msg_lnxreq_commsquality *qualmsg;
360
+	case DIDMSG_LNXREQ_COMMSQUALITY: {
361
+		struct p80211msg_lnxreq_commsquality *qualmsg;
364362 
365
-			pr_debug("Received commsquality request\n");
363
+		pr_debug("Received commsquality request\n");
366364 
367
-			qualmsg = (struct p80211msg_lnxreq_commsquality *)msg;
365
+		qualmsg = (struct p80211msg_lnxreq_commsquality *)msg;
368366 
369
-			qualmsg->link.status =
370
-			    P80211ENUM_msgitem_status_data_ok;
371
-			qualmsg->level.status =
372
-			    P80211ENUM_msgitem_status_data_ok;
373
-			qualmsg->noise.status =
374
-			    P80211ENUM_msgitem_status_data_ok;
367
+		qualmsg->link.status = P80211ENUM_msgitem_status_data_ok;
368
+		qualmsg->level.status = P80211ENUM_msgitem_status_data_ok;
369
+		qualmsg->noise.status = P80211ENUM_msgitem_status_data_ok;
375370 
376
-			qualmsg->link.data = le16_to_cpu(hw->qual.cq_curr_bss);
377
-			qualmsg->level.data =
378
-				le16_to_cpu(hw->qual.asl_curr_bss);
379
-			qualmsg->noise.data = le16_to_cpu(hw->qual.anl_curr_fc);
380
-			qualmsg->txrate.data = hw->txrate;
371
+		qualmsg->link.data = le16_to_cpu(hw->qual.cq_curr_bss);
372
+		qualmsg->level.data = le16_to_cpu(hw->qual.asl_curr_bss);
373
+		qualmsg->noise.data = le16_to_cpu(hw->qual.anl_curr_fc);
374
+		qualmsg->txrate.data = hw->txrate;
381375 
382
-			break;
383
-		}
376
+		break;
377
+	}
384378 	default:
385379 		netdev_warn(wlandev->netdev,
386380 			    "Unknown mgmt request message 0x%08x",
....@@ -467,7 +461,7 @@
467461 		case WLAN_MSD_FWLOAD:
468462 			wlandev->msdstate = WLAN_MSD_RUNNING_PENDING;
469463 			/* Initialize the device+driver for full
470
-			 * operation. Note that this might me an FWLOAD to
464
+			 * operation. Note that this might me an FWLOAD
471465 			 * to RUNNING transition so we must not do a chip
472466 			 * or board level reset.  Note that on failure,
473467 			 * the MSD state is set to HWPRESENT because we
....@@ -852,7 +846,7 @@
852846 	result = hfa384x_drvr_getconfig(hw, HFA384x_RID_NICSERIALNUMBER,
853847 					snum, HFA384x_RID_NICSERIALNUMBER_LEN);
854848 	if (!result) {
855
-		netdev_info(wlandev->netdev, "Prism2 card SN: %*pEhp\n",
849
+		netdev_info(wlandev->netdev, "Prism2 card SN: %*pE\n",
856850 			    HFA384x_RID_NICSERIALNUMBER_LEN, snum);
857851 	} else {
858852 		netdev_err(wlandev->netdev, "Failed to retrieve Prism2 Card SN\n");
....@@ -1358,7 +1352,7 @@
13581352 		 * we get back in range.  We should block transmits and
13591353 		 * receives in this state.  Do we need an indication here?
13601354 		 * Probably not since a polling user-mode element would
1361
-		 * get this status from from p2PortStatus(FD40). What about
1355
+		 * get this status from p2PortStatus(FD40). What about
13621356 		 * p80211?
13631357 		 * Response:
13641358 		 * Block Transmits, Ignore receives of data frames
....@@ -1949,8 +1943,8 @@
19491943 	}
19501944 
19511945 	/* Get the signal rate */
1952
-	msg.msgcode = DIDmsg_dot11req_mibget;
1953
-	mibitem->did = DIDmib_p2_p2MAC_p2CurrentTxRate;
1946
+	msg.msgcode = DIDMSG_DOT11REQ_MIBGET;
1947
+	mibitem->did = DIDMIB_P2_MAC_CURRENTTXRATE;
19541948 	result = p80211req_dorequest(wlandev, (u8 *)&msg);
19551949 
19561950 	if (result) {