forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-11 297b60346df8beafee954a0fd7c2d64f33f3b9bc 
 kernel/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/trx.c
....@@ -1,27 +1,5 @@
1
-/******************************************************************************
2
- *
3
- * Copyright(c) 2009-2012  Realtek Corporation.
4
- *
5
- * This program is free software; you can redistribute it and/or modify it
6
- * under the terms of version 2 of the GNU General Public License as
7
- * published by the Free Software Foundation.
8
- *
9
- * This program is distributed in the hope that it will be useful, but WITHOUT
10
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
12
- * more details.
13
- *
14
- * The full GNU General Public License is included in this distribution in the
15
- * file called LICENSE.
16
- *
17
- * Contact Information:
18
- * wlanfae <wlanfae@realtek.com>
19
- * Realtek Corporation, No. 2, Innovation Road II, Hsinchu Science Park,
20
- * Hsinchu 300, Taiwan.
21
- *
22
- * Larry Finger <Larry.Finger@lwfinger.net>
23
- *
24
- *****************************************************************************/
1
+// SPDX-License-Identifier: GPL-2.0
2
+/* Copyright(c) 2009-2012  Realtek Corporation.*/
253 
264 #include "../wifi.h"
275 #include "../pci.h"
....@@ -282,28 +260,29 @@
282260 bool rtl8723e_rx_query_desc(struct ieee80211_hw *hw,
283261 			    struct rtl_stats *status,
284262 			    struct ieee80211_rx_status *rx_status,
285
-			    u8 *pdesc, struct sk_buff *skb)
263
+			    u8 *pdesc8, struct sk_buff *skb)
286264 {
287265 	struct rx_fwinfo_8723e *p_drvinfo;
288266 	struct ieee80211_hdr *hdr;
289
-	u32 phystatus = GET_RX_DESC_PHYST(pdesc);
267
+	__le32 *pdesc = (__le32 *)pdesc8;
268
+	u32 phystatus = get_rx_desc_physt(pdesc);
290269 
291
-	status->length = (u16)GET_RX_DESC_PKT_LEN(pdesc);
292
-	status->rx_drvinfo_size = (u8)GET_RX_DESC_DRV_INFO_SIZE(pdesc) *
270
+	status->length = (u16)get_rx_desc_pkt_len(pdesc);
271
+	status->rx_drvinfo_size = (u8)get_rx_desc_drv_info_size(pdesc) *
293272 	    RX_DRV_INFO_SIZE_UNIT;
294
-	status->rx_bufshift = (u8)(GET_RX_DESC_SHIFT(pdesc) & 0x03);
295
-	status->icv = (u16)GET_RX_DESC_ICV(pdesc);
296
-	status->crc = (u16)GET_RX_DESC_CRC32(pdesc);
273
+	status->rx_bufshift = (u8)(get_rx_desc_shift(pdesc) & 0x03);
274
+	status->icv = (u16)get_rx_desc_icv(pdesc);
275
+	status->crc = (u16)get_rx_desc_crc32(pdesc);
297276 	status->hwerror = (status->crc | status->icv);
298
-	status->decrypted = !GET_RX_DESC_SWDEC(pdesc);
299
-	status->rate = (u8)GET_RX_DESC_RXMCS(pdesc);
300
-	status->shortpreamble = (u16)GET_RX_DESC_SPLCP(pdesc);
301
-	status->isampdu = (bool)(GET_RX_DESC_PAGGR(pdesc) == 1);
302
-	status->isfirst_ampdu = (bool)((GET_RX_DESC_PAGGR(pdesc) == 1) &&
303
-				       (GET_RX_DESC_FAGGR(pdesc) == 1));
304
-	status->timestamp_low = GET_RX_DESC_TSFL(pdesc);
305
-	status->rx_is40Mhzpacket = (bool)GET_RX_DESC_BW(pdesc);
306
-	status->is_ht = (bool)GET_RX_DESC_RXHT(pdesc);
277
+	status->decrypted = !get_rx_desc_swdec(pdesc);
278
+	status->rate = (u8)get_rx_desc_rxmcs(pdesc);
279
+	status->shortpreamble = (u16)get_rx_desc_splcp(pdesc);
280
+	status->isampdu = (bool)(get_rx_desc_paggr(pdesc) == 1);
281
+	status->isfirst_ampdu = (bool)((get_rx_desc_paggr(pdesc) == 1) &&
282
+				       (get_rx_desc_faggr(pdesc) == 1));
283
+	status->timestamp_low = get_rx_desc_tsfl(pdesc);
284
+	status->rx_is40mhzpacket = (bool)get_rx_desc_bw(pdesc);
285
+	status->is_ht = (bool)get_rx_desc_rxht(pdesc);
307286 
308287 	status->is_cck = RX_HAL_IS_CCK_RATE(status->rate);
309288 
....@@ -316,7 +295,7 @@
316295 	if (status->crc)
317296 		rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
318297 
319
-	if (status->rx_is40Mhzpacket)
298
+	if (status->rx_is40mhzpacket)
320299 		rx_status->bw = RATE_INFO_BW_40;
321300 
322301 	if (status->is_ht)
....@@ -353,7 +332,7 @@
353332 		p_drvinfo = (struct rx_fwinfo_8723e *)(skb->data +
354333 						     status->rx_bufshift);
355334 
356
-		translate_rx_signal_stuff(hw, skb, status, pdesc, p_drvinfo);
335
+		translate_rx_signal_stuff(hw, skb, status, pdesc8, p_drvinfo);
357336 	}
358337 	rx_status->signal = status->recvsignalpower + 10;
359338 	return true;
....@@ -372,7 +351,8 @@
372351 	struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
373352 	bool b_defaultadapter = true;
374353 	/* bool b_trigger_ac = false; */
375
-	u8 *pdesc = (u8 *)pdesc_tx;
354
+	u8 *pdesc8 = (u8 *)pdesc_tx;
355
+	__le32 *pdesc = (__le32 *)pdesc8;
376356 	u16 seq_number;
377357 	__le16 fc = hdr->frame_control;
378358 	u8 fw_qsel = _rtl8723e_map_hwqueue_to_fwqueue(skb, hw_queue);
....@@ -382,14 +362,13 @@
382362 	bool lastseg = ((hdr->frame_control &
383363 			 cpu_to_le16(IEEE80211_FCTL_MOREFRAGS)) == 0);
384364 
385
-	dma_addr_t mapping = pci_map_single(rtlpci->pdev,
386
-					    skb->data, skb->len,
387
-					    PCI_DMA_TODEVICE);
365
+	dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
366
+					    skb->len, DMA_TO_DEVICE);
388367 	u8 bw_40 = 0;
389368 
390
-	if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
391
-		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
392
-			 "DMA mapping error\n");
369
+	if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
370
+		rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
371
+			"DMA mapping error\n");
393372 		return;
394373 	}
395374 	if (mac->opmode == NL80211_IFTYPE_STATION) {
....@@ -405,7 +384,7 @@
405384 
406385 	rtl_get_tcb_desc(hw, info, sta, skb, ptcb_desc);
407386 
408
-	CLEAR_PCI_TX_DESC_CONTENT(pdesc, sizeof(struct tx_desc_8723e));
387
+	clear_pci_tx_desc_content(pdesc, sizeof(struct tx_desc_8723e));
409388 
410389 	if (ieee80211_is_nullfunc(fc) || ieee80211_is_ctl(fc)) {
411390 		firstseg = true;
....@@ -413,58 +392,58 @@
413392 	}
414393 
415394 	if (firstseg) {
416
-		SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
395
+		set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);
417396 
418
-		SET_TX_DESC_TX_RATE(pdesc, ptcb_desc->hw_rate);
397
+		set_tx_desc_tx_rate(pdesc, ptcb_desc->hw_rate);
419398 
420399 		if (ptcb_desc->use_shortgi || ptcb_desc->use_shortpreamble)
421
-			SET_TX_DESC_DATA_SHORTGI(pdesc, 1);
400
+			set_tx_desc_data_shortgi(pdesc, 1);
422401 
423402 		if (info->flags & IEEE80211_TX_CTL_AMPDU) {
424
-			SET_TX_DESC_AGG_BREAK(pdesc, 1);
425
-			SET_TX_DESC_MAX_AGG_NUM(pdesc, 0x14);
403
+			set_tx_desc_agg_break(pdesc, 1);
404
+			set_tx_desc_max_agg_num(pdesc, 0x14);
426405 		}
427
-		SET_TX_DESC_SEQ(pdesc, seq_number);
406
+		set_tx_desc_seq(pdesc, seq_number);
428407 
429
-		SET_TX_DESC_RTS_ENABLE(pdesc,
408
+		set_tx_desc_rts_enable(pdesc,
430409 				       ((ptcb_desc->rts_enable &&
431410 					!ptcb_desc->cts_enable) ? 1 : 0));
432
-		SET_TX_DESC_HW_RTS_ENABLE(pdesc,
411
+		set_tx_desc_hw_rts_enable(pdesc,
433412 					  ((ptcb_desc->rts_enable ||
434413 					  ptcb_desc->cts_enable) ? 1 : 0));
435
-		SET_TX_DESC_CTS2SELF(pdesc,
414
+		set_tx_desc_cts2self(pdesc,
436415 				     ((ptcb_desc->cts_enable) ? 1 : 0));
437
-		SET_TX_DESC_RTS_STBC(pdesc,
416
+		set_tx_desc_rts_stbc(pdesc,
438417 				     ((ptcb_desc->rts_stbc) ? 1 : 0));
439418 
440
-		SET_TX_DESC_RTS_RATE(pdesc, ptcb_desc->rts_rate);
441
-		SET_TX_DESC_RTS_BW(pdesc, 0);
442
-		SET_TX_DESC_RTS_SC(pdesc, ptcb_desc->rts_sc);
443
-		SET_TX_DESC_RTS_SHORT(pdesc,
419
+		set_tx_desc_rts_rate(pdesc, ptcb_desc->rts_rate);
420
+		set_tx_desc_rts_bw(pdesc, 0);
421
+		set_tx_desc_rts_sc(pdesc, ptcb_desc->rts_sc);
422
+		set_tx_desc_rts_short(pdesc,
444423 				((ptcb_desc->rts_rate <= DESC92C_RATE54M) ?
445424 				(ptcb_desc->rts_use_shortpreamble ? 1 : 0)
446425 				: (ptcb_desc->rts_use_shortgi ? 1 : 0)));
447426 
448427 		if (bw_40) {
449428 			if (ptcb_desc->packet_bw == HT_CHANNEL_WIDTH_20_40) {
450
-				SET_TX_DESC_DATA_BW(pdesc, 1);
451
-				SET_TX_DESC_TX_SUB_CARRIER(pdesc, 3);
429
+				set_tx_desc_data_bw(pdesc, 1);
430
+				set_tx_desc_tx_sub_carrier(pdesc, 3);
452431 			} else {
453
-				SET_TX_DESC_DATA_BW(pdesc, 0);
454
-				SET_TX_DESC_TX_SUB_CARRIER(pdesc,
432
+				set_tx_desc_data_bw(pdesc, 0);
433
+				set_tx_desc_tx_sub_carrier(pdesc,
455434 					mac->cur_40_prime_sc);
456435 			}
457436 		} else {
458
-			SET_TX_DESC_DATA_BW(pdesc, 0);
459
-			SET_TX_DESC_TX_SUB_CARRIER(pdesc, 0);
437
+			set_tx_desc_data_bw(pdesc, 0);
438
+			set_tx_desc_tx_sub_carrier(pdesc, 0);
460439 		}
461440 
462
-		SET_TX_DESC_LINIP(pdesc, 0);
463
-		SET_TX_DESC_PKT_SIZE(pdesc, (u16) skb->len);
441
+		set_tx_desc_linip(pdesc, 0);
442
+		set_tx_desc_pkt_size(pdesc, (u16)skb->len);
464443 
465444 		if (sta) {
466445 			u8 ampdu_density = sta->ht_cap.ampdu_density;
467
-			SET_TX_DESC_AMPDU_DENSITY(pdesc, ampdu_density);
446
+			set_tx_desc_ampdu_density(pdesc, ampdu_density);
468447 		}
469448 
470449 		if (info->control.hw_key) {
....@@ -475,129 +454,129 @@
475454 			case WLAN_CIPHER_SUITE_WEP40:
476455 			case WLAN_CIPHER_SUITE_WEP104:
477456 			case WLAN_CIPHER_SUITE_TKIP:
478
-				SET_TX_DESC_SEC_TYPE(pdesc, 0x1);
457
+				set_tx_desc_sec_type(pdesc, 0x1);
479458 				break;
480459 			case WLAN_CIPHER_SUITE_CCMP:
481
-				SET_TX_DESC_SEC_TYPE(pdesc, 0x3);
460
+				set_tx_desc_sec_type(pdesc, 0x3);
482461 				break;
483462 			default:
484
-				SET_TX_DESC_SEC_TYPE(pdesc, 0x0);
463
+				set_tx_desc_sec_type(pdesc, 0x0);
485464 				break;
486465 
487466 			}
488467 		}
489468 
490
-		SET_TX_DESC_PKT_ID(pdesc, 0);
491
-		SET_TX_DESC_QUEUE_SEL(pdesc, fw_qsel);
469
+		set_tx_desc_pkt_id(pdesc, 0);
470
+		set_tx_desc_queue_sel(pdesc, fw_qsel);
492471 
493
-		SET_TX_DESC_DATA_RATE_FB_LIMIT(pdesc, 0x1F);
494
-		SET_TX_DESC_RTS_RATE_FB_LIMIT(pdesc, 0xF);
495
-		SET_TX_DESC_DISABLE_FB(pdesc, 0);
496
-		SET_TX_DESC_USE_RATE(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
472
+		set_tx_desc_data_rate_fb_limit(pdesc, 0x1F);
473
+		set_tx_desc_rts_rate_fb_limit(pdesc, 0xF);
474
+		set_tx_desc_disable_fb(pdesc, 0);
475
+		set_tx_desc_use_rate(pdesc, ptcb_desc->use_driver_rate ? 1 : 0);
497476 
498477 		if (ieee80211_is_data_qos(fc)) {
499478 			if (mac->rdg_en) {
500
-				RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
501
-					 "Enable RDG function.\n");
502
-				SET_TX_DESC_RDG_ENABLE(pdesc, 1);
503
-				SET_TX_DESC_HTC(pdesc, 1);
479
+				rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
480
+					"Enable RDG function.\n");
481
+				set_tx_desc_rdg_enable(pdesc, 1);
482
+				set_tx_desc_htc(pdesc, 1);
504483 			}
505484 		}
506485 	}
507486 
508
-	SET_TX_DESC_FIRST_SEG(pdesc, (firstseg ? 1 : 0));
509
-	SET_TX_DESC_LAST_SEG(pdesc, (lastseg ? 1 : 0));
487
+	set_tx_desc_first_seg(pdesc, (firstseg ? 1 : 0));
488
+	set_tx_desc_last_seg(pdesc, (lastseg ? 1 : 0));
510489 
511
-	SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) skb->len);
490
+	set_tx_desc_tx_buffer_size(pdesc, (u16)skb->len);
512491 
513
-	SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
492
+	set_tx_desc_tx_buffer_address(pdesc, mapping);
514493 
515494 	if (rtlpriv->dm.useramask) {
516
-		SET_TX_DESC_RATE_ID(pdesc, ptcb_desc->ratr_index);
517
-		SET_TX_DESC_MACID(pdesc, ptcb_desc->mac_id);
495
+		set_tx_desc_rate_id(pdesc, ptcb_desc->ratr_index);
496
+		set_tx_desc_macid(pdesc, ptcb_desc->mac_id);
518497 	} else {
519
-		SET_TX_DESC_RATE_ID(pdesc, 0xC + ptcb_desc->ratr_index);
520
-		SET_TX_DESC_MACID(pdesc, ptcb_desc->ratr_index);
498
+		set_tx_desc_rate_id(pdesc, 0xC + ptcb_desc->ratr_index);
499
+		set_tx_desc_macid(pdesc, ptcb_desc->ratr_index);
521500 	}
522501 
523502 	if ((!ieee80211_is_data_qos(fc)) && ppsc->fwctrl_lps) {
524
-		SET_TX_DESC_HWSEQ_EN_8723(pdesc, 1);
525
-		/* SET_TX_DESC_HWSEQ_EN(pdesc, 1); */
526
-		/* SET_TX_DESC_PKT_ID(pdesc, 8); */
503
+		set_tx_desc_hwseq_en_8723(pdesc, 1);
504
+		/* set_tx_desc_hwseq_en(pdesc, 1); */
505
+		/* set_tx_desc_pkt_id(pdesc, 8); */
527506 
528507 		if (!b_defaultadapter)
529
-			SET_TX_DESC_HWSEQ_SEL_8723(pdesc, 1);
530
-	/* SET_TX_DESC_QOS(pdesc, 1); */
508
+			set_tx_desc_hwseq_sel_8723(pdesc, 1);
509
+	/* set_tx_desc_qos(pdesc, 1); */
531510 	}
532511 
533
-	SET_TX_DESC_MORE_FRAG(pdesc, (lastseg ? 0 : 1));
512
+	set_tx_desc_more_frag(pdesc, (lastseg ? 0 : 1));
534513 
535514 	if (is_multicast_ether_addr(ieee80211_get_DA(hdr)) ||
536515 	    is_broadcast_ether_addr(ieee80211_get_DA(hdr))) {
537
-		SET_TX_DESC_BMC(pdesc, 1);
516
+		set_tx_desc_bmc(pdesc, 1);
538517 	}
539518 
540
-	RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
519
+	rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE, "\n");
541520 }
542521 
543522 void rtl8723e_tx_fill_cmddesc(struct ieee80211_hw *hw,
544
-			      u8 *pdesc, bool firstseg,
523
+			      u8 *pdesc8, bool firstseg,
545524 			      bool lastseg, struct sk_buff *skb)
546525 {
547526 	struct rtl_priv *rtlpriv = rtl_priv(hw);
548527 	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
549528 	u8 fw_queue = QSLT_BEACON;
529
+	__le32 *pdesc = (__le32 *)pdesc8;
550530 
551
-	dma_addr_t mapping = pci_map_single(rtlpci->pdev,
552
-					    skb->data, skb->len,
553
-					    PCI_DMA_TODEVICE);
531
+	dma_addr_t mapping = dma_map_single(&rtlpci->pdev->dev, skb->data,
532
+					    skb->len, DMA_TO_DEVICE);
554533 
555534 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)(skb->data);
556535 	__le16 fc = hdr->frame_control;
557536 
558
-	if (pci_dma_mapping_error(rtlpci->pdev, mapping)) {
559
-		RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE,
560
-			 "DMA mapping error\n");
537
+	if (dma_mapping_error(&rtlpci->pdev->dev, mapping)) {
538
+		rtl_dbg(rtlpriv, COMP_SEND, DBG_TRACE,
539
+			"DMA mapping error\n");
561540 		return;
562541 	}
563
-	CLEAR_PCI_TX_DESC_CONTENT(pdesc, TX_DESC_SIZE);
542
+	clear_pci_tx_desc_content(pdesc, TX_DESC_SIZE);
564543 
565544 	if (firstseg)
566
-		SET_TX_DESC_OFFSET(pdesc, USB_HWDESC_HEADER_LEN);
545
+		set_tx_desc_offset(pdesc, USB_HWDESC_HEADER_LEN);
567546 
568
-	SET_TX_DESC_TX_RATE(pdesc, DESC92C_RATE1M);
547
+	set_tx_desc_tx_rate(pdesc, DESC92C_RATE1M);
569548 
570
-	SET_TX_DESC_SEQ(pdesc, 0);
549
+	set_tx_desc_seq(pdesc, 0);
571550 
572
-	SET_TX_DESC_LINIP(pdesc, 0);
551
+	set_tx_desc_linip(pdesc, 0);
573552 
574
-	SET_TX_DESC_QUEUE_SEL(pdesc, fw_queue);
553
+	set_tx_desc_queue_sel(pdesc, fw_queue);
575554 
576
-	SET_TX_DESC_FIRST_SEG(pdesc, 1);
577
-	SET_TX_DESC_LAST_SEG(pdesc, 1);
555
+	set_tx_desc_first_seg(pdesc, 1);
556
+	set_tx_desc_last_seg(pdesc, 1);
578557 
579
-	SET_TX_DESC_TX_BUFFER_SIZE(pdesc, (u16) (skb->len));
558
+	set_tx_desc_tx_buffer_size(pdesc, (u16)(skb->len));
580559 
581
-	SET_TX_DESC_TX_BUFFER_ADDRESS(pdesc, mapping);
560
+	set_tx_desc_tx_buffer_address(pdesc, mapping);
582561 
583
-	SET_TX_DESC_RATE_ID(pdesc, 7);
584
-	SET_TX_DESC_MACID(pdesc, 0);
562
+	set_tx_desc_rate_id(pdesc, 7);
563
+	set_tx_desc_macid(pdesc, 0);
585564 
586
-	SET_TX_DESC_OWN(pdesc, 1);
565
+	set_tx_desc_own(pdesc, 1);
587566 
588
-	SET_TX_DESC_PKT_SIZE((u8 *)pdesc, (u16)(skb->len));
567
+	set_tx_desc_pkt_size(pdesc, (u16)(skb->len));
589568 
590
-	SET_TX_DESC_FIRST_SEG(pdesc, 1);
591
-	SET_TX_DESC_LAST_SEG(pdesc, 1);
569
+	set_tx_desc_first_seg(pdesc, 1);
570
+	set_tx_desc_last_seg(pdesc, 1);
592571 
593
-	SET_TX_DESC_OFFSET(pdesc, 0x20);
572
+	set_tx_desc_offset(pdesc, 0x20);
594573 
595
-	SET_TX_DESC_USE_RATE(pdesc, 1);
574
+	set_tx_desc_use_rate(pdesc, 1);
596575 
597576 	if (!ieee80211_is_data_qos(fc)) {
598
-		SET_TX_DESC_HWSEQ_EN_8723(pdesc, 1);
599
-		/* SET_TX_DESC_HWSEQ_EN(pdesc, 1); */
600
-		/* SET_TX_DESC_PKT_ID(pdesc, 8); */
577
+		set_tx_desc_hwseq_en_8723(pdesc, 1);
578
+		/* set_tx_desc_hwseq_en(pdesc, 1); */
579
+		/* set_tx_desc_pkt_id(pdesc, 8); */
601580 	}
602581 
603582 	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,
....@@ -605,16 +584,18 @@
605584 		      pdesc, TX_DESC_SIZE);
606585 }
607586 
608
-void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc,
587
+void rtl8723e_set_desc(struct ieee80211_hw *hw, u8 *pdesc8,
609588 		       bool istx, u8 desc_name, u8 *val)
610589 {
611
-	if (istx == true) {
590
+	__le32 *pdesc = (__le32 *)pdesc8;
591
+
592
+	if (istx) {
612593 		switch (desc_name) {
613594 		case HW_DESC_OWN:
614
-			SET_TX_DESC_OWN(pdesc, 1);
595
+			set_tx_desc_own(pdesc, 1);
615596 			break;
616597 		case HW_DESC_TX_NEXTDESC_ADDR:
617
-			SET_TX_DESC_NEXT_DESC_ADDRESS(pdesc, *(u32 *) val);
598
+			set_tx_desc_next_desc_address(pdesc, *(u32 *)val);
618599 			break;
619600 		default:
620601 			WARN_ONCE(true, "rtl8723ae: ERR txdesc :%d not processed\n",
....@@ -624,16 +605,16 @@
624605 	} else {
625606 		switch (desc_name) {
626607 		case HW_DESC_RXOWN:
627
-			SET_RX_DESC_OWN(pdesc, 1);
608
+			set_rx_desc_own(pdesc, 1);
628609 			break;
629610 		case HW_DESC_RXBUFF_ADDR:
630
-			SET_RX_DESC_BUFF_ADDR(pdesc, *(u32 *) val);
611
+			set_rx_desc_buff_addr(pdesc, *(u32 *)val);
631612 			break;
632613 		case HW_DESC_RXPKT_LEN:
633
-			SET_RX_DESC_PKT_LEN(pdesc, *(u32 *) val);
614
+			set_rx_desc_pkt_len(pdesc, *(u32 *)val);
634615 			break;
635616 		case HW_DESC_RXERO:
636
-			SET_RX_DESC_EOR(pdesc, 1);
617
+			set_rx_desc_eor(pdesc, 1);
637618 			break;
638619 		default:
639620 			WARN_ONCE(true, "rtl8723ae: ERR rxdesc :%d not processed\n",
....@@ -644,17 +625,18 @@
644625 }
645626 
646627 u64 rtl8723e_get_desc(struct ieee80211_hw *hw,
647
-		      u8 *pdesc, bool istx, u8 desc_name)
628
+		      u8 *pdesc8, bool istx, u8 desc_name)
648629 {
649630 	u32 ret = 0;
631
+	__le32 *pdesc = (__le32 *)pdesc8;
650632 
651
-	if (istx == true) {
633
+	if (istx) {
652634 		switch (desc_name) {
653635 		case HW_DESC_OWN:
654
-			ret = GET_TX_DESC_OWN(pdesc);
636
+			ret = get_tx_desc_own(pdesc);
655637 			break;
656638 		case HW_DESC_TXBUFF_ADDR:
657
-			ret = GET_TX_DESC_TX_BUFFER_ADDRESS(pdesc);
639
+			ret = get_tx_desc_tx_buffer_address(pdesc);
658640 			break;
659641 		default:
660642 			WARN_ONCE(true, "rtl8723ae: ERR txdesc :%d not processed\n",
....@@ -664,13 +646,13 @@
664646 	} else {
665647 		switch (desc_name) {
666648 		case HW_DESC_OWN:
667
-			ret = GET_RX_DESC_OWN(pdesc);
649
+			ret = get_rx_desc_own(pdesc);
668650 			break;
669651 		case HW_DESC_RXPKT_LEN:
670
-			ret = GET_RX_DESC_PKT_LEN(pdesc);
652
+			ret = get_rx_desc_pkt_len(pdesc);
671653 			break;
672654 		case HW_DESC_RXBUFF_ADDR:
673
-			ret = GET_RX_DESC_BUFF_ADDR(pdesc);
655
+			ret = get_rx_desc_buff_addr(pdesc);
674656 			break;
675657 		default:
676658 			WARN_ONCE(true, "rtl8723ae: ERR rxdesc :%d not processed\n",