.. | .. |
---|
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.*/ |
---|
25 | 3 | |
---|
26 | 4 | #include "wifi.h" |
---|
27 | 5 | #include "base.h" |
---|
.. | .. |
---|
41 | 19 | rtlpriv->intf_ops->reset_trx_ring(hw); |
---|
42 | 20 | |
---|
43 | 21 | if (is_hal_stop(rtlhal)) |
---|
44 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
45 | | - "Driver is already down!\n"); |
---|
| 22 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
| 23 | + "Driver is already down!\n"); |
---|
46 | 24 | |
---|
47 | 25 | /*<2> Enable Adapter */ |
---|
48 | 26 | if (rtlpriv->cfg->ops->hw_init(hw)) |
---|
.. | .. |
---|
90 | 68 | { |
---|
91 | 69 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
92 | 70 | struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); |
---|
93 | | - enum rf_pwrstate rtstate; |
---|
94 | 71 | bool actionallowed = false; |
---|
95 | 72 | u16 rfwait_cnt = 0; |
---|
96 | 73 | |
---|
.. | .. |
---|
103 | 80 | if (ppsc->rfchange_inprogress) { |
---|
104 | 81 | spin_unlock(&rtlpriv->locks.rf_ps_lock); |
---|
105 | 82 | |
---|
106 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
107 | | - "RF Change in progress! Wait to set..state_toset(%d).\n", |
---|
108 | | - state_toset); |
---|
| 83 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
| 84 | + "RF Change in progress! Wait to set..state_toset(%d).\n", |
---|
| 85 | + state_toset); |
---|
109 | 86 | |
---|
110 | 87 | /* Set RF after the previous action is done. */ |
---|
111 | 88 | while (ppsc->rfchange_inprogress) { |
---|
.. | .. |
---|
123 | 100 | break; |
---|
124 | 101 | } |
---|
125 | 102 | } |
---|
126 | | - |
---|
127 | | - rtstate = ppsc->rfpwr_state; |
---|
128 | 103 | |
---|
129 | 104 | switch (state_toset) { |
---|
130 | 105 | case ERFON: |
---|
.. | .. |
---|
183 | 158 | if (ppsc->inactive_pwrstate == ERFON && |
---|
184 | 159 | rtlhal->interface == INTF_PCI) { |
---|
185 | 160 | if ((ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM) && |
---|
186 | | - RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM) && |
---|
187 | | - rtlhal->interface == INTF_PCI) { |
---|
| 161 | + RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM)) { |
---|
188 | 162 | rtlpriv->intf_ops->disable_aspm(hw); |
---|
189 | 163 | RT_CLEAR_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM); |
---|
190 | 164 | } |
---|
.. | .. |
---|
205 | 179 | ppsc->swrf_processing = false; |
---|
206 | 180 | } |
---|
207 | 181 | |
---|
208 | | -void rtl_ips_nic_off_wq_callback(void *data) |
---|
| 182 | +void rtl_ips_nic_off_wq_callback(struct work_struct *work) |
---|
209 | 183 | { |
---|
210 | | - struct rtl_works *rtlworks = |
---|
211 | | - container_of_dwork_rtl(data, struct rtl_works, ips_nic_off_wq); |
---|
| 184 | + struct rtl_works *rtlworks = container_of(work, struct rtl_works, |
---|
| 185 | + ips_nic_off_wq.work); |
---|
212 | 186 | struct ieee80211_hw *hw = rtlworks->hw; |
---|
213 | 187 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
214 | 188 | struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw)); |
---|
.. | .. |
---|
217 | 191 | enum rf_pwrstate rtstate; |
---|
218 | 192 | |
---|
219 | 193 | if (mac->opmode != NL80211_IFTYPE_STATION) { |
---|
220 | | - RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
221 | | - "not station return\n"); |
---|
| 194 | + rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING, |
---|
| 195 | + "not station return\n"); |
---|
222 | 196 | return; |
---|
223 | 197 | } |
---|
224 | 198 | |
---|
.. | .. |
---|
254 | 228 | !ppsc->swrf_processing && |
---|
255 | 229 | (mac->link_state == MAC80211_NOLINK) && |
---|
256 | 230 | !mac->act_scanning) { |
---|
257 | | - RT_TRACE(rtlpriv, COMP_RF, DBG_TRACE, |
---|
258 | | - "IPSEnter(): Turn off RF\n"); |
---|
| 231 | + rtl_dbg(rtlpriv, COMP_RF, DBG_TRACE, |
---|
| 232 | + "IPSEnter(): Turn off RF\n"); |
---|
259 | 233 | |
---|
260 | 234 | ppsc->inactive_pwrstate = ERFOFF; |
---|
261 | 235 | ppsc->in_powersavemode = true; |
---|
.. | .. |
---|
333 | 307 | ppsc->last_delaylps_stamp_jiffies); |
---|
334 | 308 | |
---|
335 | 309 | if (ps_timediff < 2000) { |
---|
336 | | - RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, |
---|
337 | | - "Delay enter Fw LPS for DHCP, ARP, or EAPOL exchanging state\n"); |
---|
| 310 | + rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, |
---|
| 311 | + "Delay enter Fw LPS for DHCP, ARP, or EAPOL exchanging state\n"); |
---|
338 | 312 | return false; |
---|
339 | 313 | } |
---|
340 | 314 | |
---|
.. | .. |
---|
379 | 353 | |
---|
380 | 354 | if ((ppsc->fwctrl_lps) && ppsc->report_linked) { |
---|
381 | 355 | if (ppsc->dot11_psmode == EACTIVE) { |
---|
382 | | - RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
---|
383 | | - "FW LPS leave ps_mode:%x\n", |
---|
384 | | - FW_PS_ACTIVE_MODE); |
---|
| 356 | + rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG, |
---|
| 357 | + "FW LPS leave ps_mode:%x\n", |
---|
| 358 | + FW_PS_ACTIVE_MODE); |
---|
385 | 359 | enter_fwlps = false; |
---|
386 | 360 | ppsc->pwr_mode = FW_PS_ACTIVE_MODE; |
---|
387 | 361 | ppsc->smart_ps = 0; |
---|
.. | .. |
---|
394 | 368 | rtlpriv->btcoexist.btc_ops->btc_lps_notify(rtlpriv, rt_psmode); |
---|
395 | 369 | } else { |
---|
396 | 370 | if (rtl_get_fwlps_doze(hw)) { |
---|
397 | | - RT_TRACE(rtlpriv, COMP_RF, DBG_DMESG, |
---|
398 | | - "FW LPS enter ps_mode:%x\n", |
---|
399 | | - ppsc->fwctrl_psmode); |
---|
| 371 | + rtl_dbg(rtlpriv, COMP_RF, DBG_DMESG, |
---|
| 372 | + "FW LPS enter ps_mode:%x\n", |
---|
| 373 | + ppsc->fwctrl_psmode); |
---|
400 | 374 | if (rtlpriv->cfg->ops->get_btc_status()) |
---|
401 | 375 | rtlpriv->btcoexist.btc_ops->btc_lps_notify(rtlpriv, rt_psmode); |
---|
402 | 376 | enter_fwlps = true; |
---|
.. | .. |
---|
446 | 420 | * bt_ccoexist may ask to enter lps. |
---|
447 | 421 | * In normal case, this constraint move to rtl_lps_set_psmode(). |
---|
448 | 422 | */ |
---|
449 | | - RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, |
---|
450 | | - "Enter 802.11 power save mode...\n"); |
---|
| 423 | + rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, |
---|
| 424 | + "Enter 802.11 power save mode...\n"); |
---|
451 | 425 | rtl_lps_set_psmode(hw, EAUTOPS); |
---|
452 | 426 | |
---|
453 | 427 | mutex_unlock(&rtlpriv->locks.lps_mutex); |
---|
.. | .. |
---|
475 | 449 | RT_CLEAR_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM); |
---|
476 | 450 | } |
---|
477 | 451 | |
---|
478 | | - RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, |
---|
479 | | - "Busy Traffic,Leave 802.11 power save..\n"); |
---|
| 452 | + rtl_dbg(rtlpriv, COMP_POWER, DBG_LOUD, |
---|
| 453 | + "Busy Traffic,Leave 802.11 power save..\n"); |
---|
480 | 454 | |
---|
481 | 455 | rtl_lps_set_psmode(hw, EACTIVE); |
---|
482 | 456 | } |
---|
.. | .. |
---|
560 | 534 | queue_delayed_work(rtlpriv->works.rtl_wq, |
---|
561 | 535 | &rtlpriv->works.ps_work, MSECS(5)); |
---|
562 | 536 | } else { |
---|
563 | | - RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, |
---|
564 | | - "u_bufferd: %x, m_buffered: %x\n", u_buffed, m_buffed); |
---|
| 537 | + rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG, |
---|
| 538 | + "u_bufferd: %x, m_buffered: %x\n", u_buffed, m_buffed); |
---|
565 | 539 | } |
---|
566 | 540 | } |
---|
567 | 541 | EXPORT_SYMBOL_GPL(rtl_swlps_beacon); |
---|
.. | .. |
---|
588 | 562 | mutex_unlock(&rtlpriv->locks.lps_mutex); |
---|
589 | 563 | } |
---|
590 | 564 | |
---|
591 | | -void rtl_swlps_rfon_wq_callback(void *data) |
---|
| 565 | +void rtl_swlps_rfon_wq_callback(struct work_struct *work) |
---|
592 | 566 | { |
---|
593 | | - struct rtl_works *rtlworks = |
---|
594 | | - container_of_dwork_rtl(data, struct rtl_works, ps_rfon_wq); |
---|
| 567 | + struct rtl_works *rtlworks = container_of(work, struct rtl_works, |
---|
| 568 | + ps_rfon_wq.work); |
---|
595 | 569 | struct ieee80211_hw *hw = rtlworks->hw; |
---|
596 | 570 | |
---|
597 | 571 | rtl_swlps_rf_awake(hw); |
---|
.. | .. |
---|
656 | 630 | /* this print should always be dtim_conter = 0 & |
---|
657 | 631 | * sleep = dtim_period, that meaons, we should |
---|
658 | 632 | * awake before every dtim */ |
---|
659 | | - RT_TRACE(rtlpriv, COMP_POWER, DBG_DMESG, |
---|
660 | | - "dtim_counter:%x will sleep :%d beacon_intv\n", |
---|
661 | | - rtlpriv->psc.dtim_counter, sleep_intv); |
---|
| 633 | + rtl_dbg(rtlpriv, COMP_POWER, DBG_DMESG, |
---|
| 634 | + "dtim_counter:%x will sleep :%d beacon_intv\n", |
---|
| 635 | + rtlpriv->psc.dtim_counter, sleep_intv); |
---|
662 | 636 | |
---|
663 | 637 | /* we tested that 40ms is enough for sw & hw sw delay */ |
---|
664 | 638 | queue_delayed_work(rtlpriv->works.rtl_wq, &rtlpriv->works.ps_rfon_wq, |
---|
.. | .. |
---|
679 | 653 | } |
---|
680 | 654 | EXPORT_SYMBOL_GPL(rtl_lps_change_work_callback); |
---|
681 | 655 | |
---|
682 | | -void rtl_lps_enter(struct ieee80211_hw *hw) |
---|
| 656 | +void rtl_lps_enter(struct ieee80211_hw *hw, bool may_block) |
---|
683 | 657 | { |
---|
684 | 658 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
685 | 659 | |
---|
686 | | - if (!in_interrupt()) |
---|
| 660 | + if (may_block) |
---|
687 | 661 | return rtl_lps_enter_core(hw); |
---|
688 | 662 | rtlpriv->enter_ps = true; |
---|
689 | 663 | schedule_work(&rtlpriv->works.lps_change_work); |
---|
690 | 664 | } |
---|
691 | 665 | EXPORT_SYMBOL_GPL(rtl_lps_enter); |
---|
692 | 666 | |
---|
693 | | -void rtl_lps_leave(struct ieee80211_hw *hw) |
---|
| 667 | +void rtl_lps_leave(struct ieee80211_hw *hw, bool may_block) |
---|
694 | 668 | { |
---|
695 | 669 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
696 | 670 | |
---|
697 | | - if (!in_interrupt()) |
---|
| 671 | + if (may_block) |
---|
698 | 672 | return rtl_lps_leave_core(hw); |
---|
699 | 673 | rtlpriv->enter_ps = false; |
---|
700 | 674 | schedule_work(&rtlpriv->works.lps_change_work); |
---|
701 | 675 | } |
---|
702 | 676 | EXPORT_SYMBOL_GPL(rtl_lps_leave); |
---|
703 | 677 | |
---|
704 | | -void rtl_swlps_wq_callback(void *data) |
---|
| 678 | +void rtl_swlps_wq_callback(struct work_struct *work) |
---|
705 | 679 | { |
---|
706 | | - struct rtl_works *rtlworks = container_of_dwork_rtl(data, |
---|
707 | | - struct rtl_works, |
---|
708 | | - ps_work); |
---|
| 680 | + struct rtl_works *rtlworks = container_of(work, struct rtl_works, |
---|
| 681 | + ps_work.work); |
---|
709 | 682 | struct ieee80211_hw *hw = rtlworks->hw; |
---|
710 | 683 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
---|
711 | 684 | bool ps = false; |
---|
.. | .. |
---|
740 | 713 | static u8 p2p_oui_ie_type[4] = {0x50, 0x6f, 0x9a, 0x09}; |
---|
741 | 714 | u8 noa_num, index , i, noa_index = 0; |
---|
742 | 715 | bool find_p2p_ie = false , find_p2p_ps_ie = false; |
---|
| 716 | + |
---|
743 | 717 | pos = (u8 *)mgmt->u.beacon.variable; |
---|
744 | 718 | end = data + len; |
---|
745 | 719 | ie = NULL; |
---|
.. | .. |
---|
762 | 736 | find_p2p_ie = true; |
---|
763 | 737 | /*to find noa ie*/ |
---|
764 | 738 | while (ie + 1 < end) { |
---|
765 | | - noa_len = READEF2BYTE((__le16 *)&ie[1]); |
---|
| 739 | + noa_len = le16_to_cpu(*((__le16 *)&ie[1])); |
---|
766 | 740 | if (ie + 3 + ie[1] > end) |
---|
767 | 741 | return; |
---|
768 | 742 | |
---|
769 | 743 | if (ie[0] == 12) { |
---|
770 | 744 | find_p2p_ps_ie = true; |
---|
771 | 745 | if ((noa_len - 2) % 13 != 0) { |
---|
772 | | - RT_TRACE(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
773 | | - "P2P notice of absence: invalid length.%d\n", |
---|
774 | | - noa_len); |
---|
| 746 | + rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, |
---|
| 747 | + "P2P notice of absence: invalid length.%d\n", |
---|
| 748 | + noa_len); |
---|
775 | 749 | return; |
---|
776 | 750 | } else { |
---|
777 | 751 | noa_num = (noa_len - 2) / 13; |
---|
.. | .. |
---|
782 | 756 | noa_index = ie[3]; |
---|
783 | 757 | if (rtlpriv->psc.p2p_ps_info.p2p_ps_mode == |
---|
784 | 758 | P2P_PS_NONE || noa_index != p2pinfo->noa_index) { |
---|
785 | | - RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, |
---|
786 | | - "update NOA ie.\n"); |
---|
| 759 | + rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, |
---|
| 760 | + "update NOA ie.\n"); |
---|
787 | 761 | p2pinfo->noa_index = noa_index; |
---|
788 | 762 | p2pinfo->opp_ps = (ie[4] >> 7); |
---|
789 | 763 | p2pinfo->ctwindow = ie[4] & 0x7F; |
---|
.. | .. |
---|
791 | 765 | index = 5; |
---|
792 | 766 | for (i = 0; i < noa_num; i++) { |
---|
793 | 767 | p2pinfo->noa_count_type[i] = |
---|
794 | | - READEF1BYTE(ie+index); |
---|
| 768 | + *(u8 *)(ie + index); |
---|
795 | 769 | index += 1; |
---|
796 | 770 | p2pinfo->noa_duration[i] = |
---|
797 | | - READEF4BYTE((__le32 *)ie+index); |
---|
| 771 | + le32_to_cpu(*(__le32 *)(ie + index)); |
---|
798 | 772 | index += 4; |
---|
799 | 773 | p2pinfo->noa_interval[i] = |
---|
800 | | - READEF4BYTE((__le32 *)ie+index); |
---|
| 774 | + le32_to_cpu(*(__le32 *)(ie + index)); |
---|
801 | 775 | index += 4; |
---|
802 | 776 | p2pinfo->noa_start_time[i] = |
---|
803 | | - READEF4BYTE((__le32 *)ie+index); |
---|
| 777 | + le32_to_cpu(*(__le32 *)(ie + index)); |
---|
804 | 778 | index += 4; |
---|
805 | 779 | } |
---|
806 | 780 | |
---|
.. | .. |
---|
854 | 828 | if (ie == NULL) |
---|
855 | 829 | return; |
---|
856 | 830 | |
---|
857 | | - RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "action frame find P2P IE.\n"); |
---|
| 831 | + rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "action frame find P2P IE.\n"); |
---|
858 | 832 | /*to find noa ie*/ |
---|
859 | 833 | while (ie + 1 < end) { |
---|
860 | | - noa_len = READEF2BYTE((__le16 *)&ie[1]); |
---|
| 834 | + noa_len = le16_to_cpu(*(__le16 *)&ie[1]); |
---|
861 | 835 | if (ie + 3 + ie[1] > end) |
---|
862 | 836 | return; |
---|
863 | 837 | |
---|
864 | 838 | if (ie[0] == 12) { |
---|
865 | | - RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "find NOA IE.\n"); |
---|
| 839 | + rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "find NOA IE.\n"); |
---|
866 | 840 | RT_PRINT_DATA(rtlpriv, COMP_FW, DBG_LOUD, "noa ie ", |
---|
867 | 841 | ie, noa_len); |
---|
868 | 842 | if ((noa_len - 2) % 13 != 0) { |
---|
869 | | - RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, |
---|
870 | | - "P2P notice of absence: invalid length.%d\n", |
---|
871 | | - noa_len); |
---|
| 843 | + rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, |
---|
| 844 | + "P2P notice of absence: invalid length.%d\n", |
---|
| 845 | + noa_len); |
---|
872 | 846 | return; |
---|
873 | 847 | } else { |
---|
874 | 848 | noa_num = (noa_len - 2) / 13; |
---|
.. | .. |
---|
886 | 860 | index = 5; |
---|
887 | 861 | for (i = 0; i < noa_num; i++) { |
---|
888 | 862 | p2pinfo->noa_count_type[i] = |
---|
889 | | - READEF1BYTE(ie+index); |
---|
| 863 | + *(u8 *)(ie + index); |
---|
890 | 864 | index += 1; |
---|
891 | 865 | p2pinfo->noa_duration[i] = |
---|
892 | | - READEF4BYTE((__le32 *)ie+index); |
---|
| 866 | + le32_to_cpu(*(__le32 *)(ie + index)); |
---|
893 | 867 | index += 4; |
---|
894 | 868 | p2pinfo->noa_interval[i] = |
---|
895 | | - READEF4BYTE((__le32 *)ie+index); |
---|
| 869 | + le32_to_cpu(*(__le32 *)(ie + index)); |
---|
896 | 870 | index += 4; |
---|
897 | 871 | p2pinfo->noa_start_time[i] = |
---|
898 | | - READEF4BYTE((__le32 *)ie+index); |
---|
| 872 | + le32_to_cpu(*(__le32 *)(ie + index)); |
---|
899 | 873 | index += 4; |
---|
900 | 874 | } |
---|
901 | 875 | |
---|
.. | .. |
---|
926 | 900 | struct rtl_ps_ctl *rtlps = rtl_psc(rtl_priv(hw)); |
---|
927 | 901 | struct rtl_p2p_ps_info *p2pinfo = &(rtlpriv->psc.p2p_ps_info); |
---|
928 | 902 | |
---|
929 | | - RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, " p2p state %x\n" , p2p_ps_state); |
---|
| 903 | + rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, " p2p state %x\n", p2p_ps_state); |
---|
930 | 904 | switch (p2p_ps_state) { |
---|
931 | 905 | case P2P_PS_DISABLE: |
---|
932 | 906 | p2pinfo->p2p_ps_state = p2p_ps_state; |
---|
.. | .. |
---|
978 | 952 | default: |
---|
979 | 953 | break; |
---|
980 | 954 | } |
---|
981 | | - RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, |
---|
982 | | - "ctwindow %x oppps %x\n", |
---|
983 | | - p2pinfo->ctwindow , p2pinfo->opp_ps); |
---|
984 | | - RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, |
---|
985 | | - "count %x duration %x index %x interval %x start time %x noa num %x\n", |
---|
986 | | - p2pinfo->noa_count_type[0], |
---|
987 | | - p2pinfo->noa_duration[0], |
---|
988 | | - p2pinfo->noa_index, |
---|
989 | | - p2pinfo->noa_interval[0], |
---|
990 | | - p2pinfo->noa_start_time[0], |
---|
991 | | - p2pinfo->noa_num); |
---|
992 | | - RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "end\n"); |
---|
| 955 | + rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, |
---|
| 956 | + "ctwindow %x oppps %x\n", |
---|
| 957 | + p2pinfo->ctwindow, p2pinfo->opp_ps); |
---|
| 958 | + rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, |
---|
| 959 | + "count %x duration %x index %x interval %x start time %x noa num %x\n", |
---|
| 960 | + p2pinfo->noa_count_type[0], |
---|
| 961 | + p2pinfo->noa_duration[0], |
---|
| 962 | + p2pinfo->noa_index, |
---|
| 963 | + p2pinfo->noa_interval[0], |
---|
| 964 | + p2pinfo->noa_start_time[0], |
---|
| 965 | + p2pinfo->noa_num); |
---|
| 966 | + rtl_dbg(rtlpriv, COMP_FW, DBG_LOUD, "end\n"); |
---|
993 | 967 | } |
---|
994 | 968 | |
---|
995 | 969 | void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len) |
---|