diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index a508ea51a1f8..2da164380771 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -50,7 +50,7 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw) | |||
50 | u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor; | 50 | u8 pcibridge_vendor = pcipriv->ndis_adapter.pcibridge_vendor; |
51 | 51 | ||
52 | ppsc->reg_rfps_level = 0; | 52 | ppsc->reg_rfps_level = 0; |
53 | ppsc->b_support_aspm = 0; | 53 | ppsc->support_aspm = 0; |
54 | 54 | ||
55 | /*Update PCI ASPM setting */ | 55 | /*Update PCI ASPM setting */ |
56 | ppsc->const_amdpci_aspm = rtlpci->const_amdpci_aspm; | 56 | ppsc->const_amdpci_aspm = rtlpci->const_amdpci_aspm; |
@@ -115,29 +115,29 @@ static void _rtl_pci_update_default_setting(struct ieee80211_hw *hw) | |||
115 | switch (rtlpci->const_support_pciaspm) { | 115 | switch (rtlpci->const_support_pciaspm) { |
116 | case 0:{ | 116 | case 0:{ |
117 | /*Not support ASPM. */ | 117 | /*Not support ASPM. */ |
118 | bool b_support_aspm = false; | 118 | bool support_aspm = false; |
119 | ppsc->b_support_aspm = b_support_aspm; | 119 | ppsc->support_aspm = support_aspm; |
120 | break; | 120 | break; |
121 | } | 121 | } |
122 | case 1:{ | 122 | case 1:{ |
123 | /*Support ASPM. */ | 123 | /*Support ASPM. */ |
124 | bool b_support_aspm = true; | 124 | bool support_aspm = true; |
125 | bool b_support_backdoor = true; | 125 | bool support_backdoor = true; |
126 | ppsc->b_support_aspm = b_support_aspm; | 126 | ppsc->support_aspm = support_aspm; |
127 | 127 | ||
128 | /*if(priv->oem_id == RT_CID_TOSHIBA && | 128 | /*if(priv->oem_id == RT_CID_TOSHIBA && |
129 | !priv->ndis_adapter.amd_l1_patch) | 129 | !priv->ndis_adapter.amd_l1_patch) |
130 | b_support_backdoor = false; */ | 130 | support_backdoor = false; */ |
131 | 131 | ||
132 | ppsc->b_support_backdoor = b_support_backdoor; | 132 | ppsc->support_backdoor = support_backdoor; |
133 | 133 | ||
134 | break; | 134 | break; |
135 | } | 135 | } |
136 | case 2: | 136 | case 2: |
137 | /*ASPM value set by chipset. */ | 137 | /*ASPM value set by chipset. */ |
138 | if (pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL) { | 138 | if (pcibridge_vendor == PCI_BRIDGE_VENDOR_INTEL) { |
139 | bool b_support_aspm = true; | 139 | bool support_aspm = true; |
140 | ppsc->b_support_aspm = b_support_aspm; | 140 | ppsc->support_aspm = support_aspm; |
141 | } | 141 | } |
142 | break; | 142 | break; |
143 | default: | 143 | default: |
@@ -585,7 +585,7 @@ static void _rtl_pci_rx_interrupt(struct ieee80211_hw *hw) | |||
585 | hdr = (struct ieee80211_hdr *)(skb->data); | 585 | hdr = (struct ieee80211_hdr *)(skb->data); |
586 | fc = le16_to_cpu(hdr->frame_control); | 586 | fc = le16_to_cpu(hdr->frame_control); |
587 | 587 | ||
588 | if (!stats.b_crc) { | 588 | if (!stats.crc) { |
589 | memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, | 589 | memcpy(IEEE80211_SKB_RXCB(skb), &rx_status, |
590 | sizeof(rx_status)); | 590 | sizeof(rx_status)); |
591 | 591 | ||
@@ -890,17 +890,17 @@ static void _rtl_pci_init_struct(struct ieee80211_hw *hw, | |||
890 | rtlhal->hw = hw; | 890 | rtlhal->hw = hw; |
891 | rtlpci->pdev = pdev; | 891 | rtlpci->pdev = pdev; |
892 | 892 | ||
893 | ppsc->b_inactiveps = false; | 893 | ppsc->inactiveps = false; |
894 | ppsc->b_leisure_ps = true; | 894 | ppsc->leisure_ps = true; |
895 | ppsc->b_fwctrl_lps = true; | 895 | ppsc->fwctrl_lps = true; |
896 | ppsc->b_reg_fwctrl_lps = 3; | 896 | ppsc->reg_fwctrl_lps = 3; |
897 | ppsc->reg_max_lps_awakeintvl = 5; | 897 | ppsc->reg_max_lps_awakeintvl = 5; |
898 | 898 | ||
899 | if (ppsc->b_reg_fwctrl_lps == 1) | 899 | if (ppsc->reg_fwctrl_lps == 1) |
900 | ppsc->fwctrl_psmode = FW_PS_MIN_MODE; | 900 | ppsc->fwctrl_psmode = FW_PS_MIN_MODE; |
901 | else if (ppsc->b_reg_fwctrl_lps == 2) | 901 | else if (ppsc->reg_fwctrl_lps == 2) |
902 | ppsc->fwctrl_psmode = FW_PS_MAX_MODE; | 902 | ppsc->fwctrl_psmode = FW_PS_MAX_MODE; |
903 | else if (ppsc->b_reg_fwctrl_lps == 3) | 903 | else if (ppsc->reg_fwctrl_lps == 3) |
904 | ppsc->fwctrl_psmode = FW_PS_DTIM_MODE; | 904 | ppsc->fwctrl_psmode = FW_PS_DTIM_MODE; |
905 | 905 | ||
906 | /*Tx/Rx related var */ | 906 | /*Tx/Rx related var */ |