diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8192cu/trx.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c index 128cfcd09fa9..b875af75b893 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | |||
@@ -108,7 +108,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB, | |||
108 | 108 | ||
109 | if (bwificfg) { /* for WMM */ | 109 | if (bwificfg) { /* for WMM */ |
110 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, | 110 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
111 | ("USB Chip-B & WMM Setting.....\n")); | 111 | "USB Chip-B & WMM Setting.....\n"); |
112 | ep_map->ep_mapping[RTL_TXQ_BE] = 2; | 112 | ep_map->ep_mapping[RTL_TXQ_BE] = 2; |
113 | ep_map->ep_mapping[RTL_TXQ_BK] = 3; | 113 | ep_map->ep_mapping[RTL_TXQ_BK] = 3; |
114 | ep_map->ep_mapping[RTL_TXQ_VI] = 3; | 114 | ep_map->ep_mapping[RTL_TXQ_VI] = 3; |
@@ -118,7 +118,7 @@ static void _TwoOutEpMapping(struct ieee80211_hw *hw, bool bIsChipB, | |||
118 | ep_map->ep_mapping[RTL_TXQ_HI] = 2; | 118 | ep_map->ep_mapping[RTL_TXQ_HI] = 2; |
119 | } else { /* typical setting */ | 119 | } else { /* typical setting */ |
120 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, | 120 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
121 | ("USB typical Setting.....\n")); | 121 | "USB typical Setting.....\n"); |
122 | ep_map->ep_mapping[RTL_TXQ_BE] = 3; | 122 | ep_map->ep_mapping[RTL_TXQ_BE] = 3; |
123 | ep_map->ep_mapping[RTL_TXQ_BK] = 3; | 123 | ep_map->ep_mapping[RTL_TXQ_BK] = 3; |
124 | ep_map->ep_mapping[RTL_TXQ_VI] = 2; | 124 | ep_map->ep_mapping[RTL_TXQ_VI] = 2; |
@@ -135,7 +135,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool bwificfg, | |||
135 | struct rtl_priv *rtlpriv = rtl_priv(hw); | 135 | struct rtl_priv *rtlpriv = rtl_priv(hw); |
136 | if (bwificfg) { /* for WMM */ | 136 | if (bwificfg) { /* for WMM */ |
137 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, | 137 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
138 | ("USB 3EP Setting for WMM.....\n")); | 138 | "USB 3EP Setting for WMM.....\n"); |
139 | ep_map->ep_mapping[RTL_TXQ_BE] = 5; | 139 | ep_map->ep_mapping[RTL_TXQ_BE] = 5; |
140 | ep_map->ep_mapping[RTL_TXQ_BK] = 3; | 140 | ep_map->ep_mapping[RTL_TXQ_BK] = 3; |
141 | ep_map->ep_mapping[RTL_TXQ_VI] = 3; | 141 | ep_map->ep_mapping[RTL_TXQ_VI] = 3; |
@@ -145,7 +145,7 @@ static void _ThreeOutEpMapping(struct ieee80211_hw *hw, bool bwificfg, | |||
145 | ep_map->ep_mapping[RTL_TXQ_HI] = 2; | 145 | ep_map->ep_mapping[RTL_TXQ_HI] = 2; |
146 | } else { /* typical setting */ | 146 | } else { /* typical setting */ |
147 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, | 147 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
148 | ("USB 3EP Setting for typical.....\n")); | 148 | "USB 3EP Setting for typical.....\n"); |
149 | ep_map->ep_mapping[RTL_TXQ_BE] = 5; | 149 | ep_map->ep_mapping[RTL_TXQ_BE] = 5; |
150 | ep_map->ep_mapping[RTL_TXQ_BK] = 5; | 150 | ep_map->ep_mapping[RTL_TXQ_BK] = 5; |
151 | ep_map->ep_mapping[RTL_TXQ_VI] = 3; | 151 | ep_map->ep_mapping[RTL_TXQ_VI] = 3; |
@@ -270,23 +270,23 @@ static enum rtl_desc_qsel _rtl8192cu_mq_to_descq(struct ieee80211_hw *hw, | |||
270 | case 0: /* VO */ | 270 | case 0: /* VO */ |
271 | qsel = QSLT_VO; | 271 | qsel = QSLT_VO; |
272 | RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, | 272 | RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, |
273 | ("VO queue, set qsel = 0x%x\n", QSLT_VO)); | 273 | "VO queue, set qsel = 0x%x\n", QSLT_VO); |
274 | break; | 274 | break; |
275 | case 1: /* VI */ | 275 | case 1: /* VI */ |
276 | qsel = QSLT_VI; | 276 | qsel = QSLT_VI; |
277 | RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, | 277 | RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, |
278 | ("VI queue, set qsel = 0x%x\n", QSLT_VI)); | 278 | "VI queue, set qsel = 0x%x\n", QSLT_VI); |
279 | break; | 279 | break; |
280 | case 3: /* BK */ | 280 | case 3: /* BK */ |
281 | qsel = QSLT_BK; | 281 | qsel = QSLT_BK; |
282 | RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, | 282 | RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, |
283 | ("BK queue, set qsel = 0x%x\n", QSLT_BK)); | 283 | "BK queue, set qsel = 0x%x\n", QSLT_BK); |
284 | break; | 284 | break; |
285 | case 2: /* BE */ | 285 | case 2: /* BE */ |
286 | default: | 286 | default: |
287 | qsel = QSLT_BE; | 287 | qsel = QSLT_BE; |
288 | RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, | 288 | RT_TRACE(rtlpriv, COMP_USB, DBG_DMESG, |
289 | ("BE queue, set qsel = 0x%x\n", QSLT_BE)); | 289 | "BE queue, set qsel = 0x%x\n", QSLT_BE); |
290 | break; | 290 | break; |
291 | } | 291 | } |
292 | out: | 292 | out: |
@@ -422,17 +422,17 @@ static void _rtl_rx_process(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
422 | bv = ieee80211_is_probe_resp(fc); | 422 | bv = ieee80211_is_probe_resp(fc); |
423 | if (bv) | 423 | if (bv) |
424 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, | 424 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
425 | ("Got probe response frame.\n")); | 425 | "Got probe response frame\n"); |
426 | if (ieee80211_is_beacon(fc)) | 426 | if (ieee80211_is_beacon(fc)) |
427 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, | 427 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Got beacon frame\n"); |
428 | ("Got beacon frame.\n")); | ||
429 | if (ieee80211_is_data(fc)) | 428 | if (ieee80211_is_data(fc)) |
430 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, ("Got data frame.\n")); | 429 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "Got data frame\n"); |
431 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, | 430 | RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, |
432 | ("Fram: fc = 0x%X addr1 = 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:" | 431 | "Fram: fc = 0x%X addr1 = 0x%02X:0x%02X:0x%02X:0x%02X:0x%02X:0x%02X\n", |
433 | "0x%02X\n", fc, (u32)hdr->addr1[0], (u32)hdr->addr1[1], | 432 | fc, |
434 | (u32)hdr->addr1[2], (u32)hdr->addr1[3], (u32)hdr->addr1[4], | 433 | (u32)hdr->addr1[0], (u32)hdr->addr1[1], |
435 | (u32)hdr->addr1[5])); | 434 | (u32)hdr->addr1[2], (u32)hdr->addr1[3], |
435 | (u32)hdr->addr1[4], (u32)hdr->addr1[5]); | ||
436 | memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status)); | 436 | memcpy(IEEE80211_SKB_RXCB(skb), rx_status, sizeof(*rx_status)); |
437 | ieee80211_rx_irqsafe(hw, skb); | 437 | ieee80211_rx_irqsafe(hw, skb); |
438 | } | 438 | } |
@@ -594,7 +594,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, | |||
594 | if (ieee80211_is_data_qos(fc)) { | 594 | if (ieee80211_is_data_qos(fc)) { |
595 | if (mac->rdg_en) { | 595 | if (mac->rdg_en) { |
596 | RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, | 596 | RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, |
597 | ("Enable RDG function.\n")); | 597 | "Enable RDG function\n"); |
598 | SET_TX_DESC_RDG_ENABLE(txdesc, 1); | 598 | SET_TX_DESC_RDG_ENABLE(txdesc, 1); |
599 | SET_TX_DESC_HTC(txdesc, 1); | 599 | SET_TX_DESC_HTC(txdesc, 1); |
600 | } | 600 | } |
@@ -620,7 +620,7 @@ void rtl92cu_tx_fill_desc(struct ieee80211_hw *hw, | |||
620 | SET_TX_DESC_BMC(txdesc, 1); | 620 | SET_TX_DESC_BMC(txdesc, 1); |
621 | _rtl_fill_usb_tx_desc(txdesc); | 621 | _rtl_fill_usb_tx_desc(txdesc); |
622 | _rtl_tx_desc_checksum(txdesc); | 622 | _rtl_tx_desc_checksum(txdesc); |
623 | RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, (" %s ==>\n", __func__)); | 623 | RT_TRACE(rtlpriv, COMP_SEND, DBG_TRACE, " %s ==>\n", __func__); |
624 | } | 624 | } |
625 | 625 | ||
626 | void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc, | 626 | void rtl92cu_fill_fake_txdesc(struct ieee80211_hw *hw, u8 * pDesc, |