aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/pci.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2012-10-25 14:46:46 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-11-14 14:55:31 -0500
commit0f01545346cd97f823fc0aaf0c02d4fc7bec6d46 (patch)
tree4ec829f93837777e96c32a20cd651613f643094a /drivers/net/wireless/rtlwifi/pci.c
parenta29059359dea80065559cd4d56149cbe10350cf9 (diff)
rtlwifi: rtl8192ce: rtl8192cu: rtl8192se: rtl81723ae: Turn on building of the new driver
This patch completes the addition of the new driver for the Realtek RTL8723AE devices by adding the make file and by modifying Kconfig and Makefile of rtlwifi. Some variable names were shortened to ease the problem of limiting all lines to 80 characters, thus changes were made to wifi.h and rtl8192{ce,cu,sw}/hw.c. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Cc: <chaoming_li@realsil.com.cn> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
-rw-r--r--drivers/net/wireless/rtlwifi/pci.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index abc306b502ac..f38e30a947bc 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1309,6 +1309,7 @@ static bool rtl_pci_tx_chk_waitq_insert(struct ieee80211_hw *hw,
1309 struct rtl_priv *rtlpriv = rtl_priv(hw); 1309 struct rtl_priv *rtlpriv = rtl_priv(hw);
1310 struct rtl_sta_info *sta_entry = NULL; 1310 struct rtl_sta_info *sta_entry = NULL;
1311 u8 tid = rtl_get_tid(skb); 1311 u8 tid = rtl_get_tid(skb);
1312 __le16 fc = rtl_get_fc(skb);
1312 1313
1313 if (!sta) 1314 if (!sta)
1314 return false; 1315 return false;
@@ -1316,6 +1317,12 @@ static bool rtl_pci_tx_chk_waitq_insert(struct ieee80211_hw *hw,
1316 1317
1317 if (!rtlpriv->rtlhal.earlymode_enable) 1318 if (!rtlpriv->rtlhal.earlymode_enable)
1318 return false; 1319 return false;
1320 if (ieee80211_is_nullfunc(fc))
1321 return false;
1322 if (ieee80211_is_qos_nullfunc(fc))
1323 return false;
1324 if (ieee80211_is_pspoll(fc))
1325 return false;
1319 if (sta_entry->tids[tid].agg.agg_state != RTL_AGG_OPERATIONAL) 1326 if (sta_entry->tids[tid].agg.agg_state != RTL_AGG_OPERATIONAL)
1320 return false; 1327 return false;
1321 if (_rtl_mac_to_hwqueue(hw, skb) > VO_QUEUE) 1328 if (_rtl_mac_to_hwqueue(hw, skb) > VO_QUEUE)
@@ -1357,10 +1364,8 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
1357 u8 own; 1364 u8 own;
1358 u8 temp_one = 1; 1365 u8 temp_one = 1;
1359 1366
1360 if (ieee80211_is_auth(fc)) { 1367 if (ieee80211_is_mgmt(fc))
1361 RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n"); 1368 rtl_tx_mgmt_proc(hw, skb);
1362 rtl_ips_nic_on(hw);
1363 }
1364 1369
1365 if (rtlpriv->psc.sw_ps_enabled) { 1370 if (rtlpriv->psc.sw_ps_enabled) {
1366 if (ieee80211_is_data(fc) && !ieee80211_is_nullfunc(fc) && 1371 if (ieee80211_is_data(fc) && !ieee80211_is_nullfunc(fc) &&
@@ -1628,7 +1633,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
1628 "8192 PCI-E is found - vid/did=%x/%x\n", 1633 "8192 PCI-E is found - vid/did=%x/%x\n",
1629 venderid, deviceid); 1634 venderid, deviceid);
1630 rtlhal->hw_type = HARDWARE_TYPE_RTL8192E; 1635 rtlhal->hw_type = HARDWARE_TYPE_RTL8192E;
1631 break; 1636 return false;
1632 case RTL_PCI_REVISION_ID_8192SE: 1637 case RTL_PCI_REVISION_ID_8192SE:
1633 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, 1638 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
1634 "8192SE is found - vid/did=%x/%x\n", 1639 "8192SE is found - vid/did=%x/%x\n",
@@ -1643,6 +1648,11 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev,
1643 break; 1648 break;
1644 1649
1645 } 1650 }
1651 } else if (deviceid == RTL_PCI_8723AE_DID) {
1652 rtlhal->hw_type = HARDWARE_TYPE_RTL8723AE;
1653 RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,
1654 "8723AE PCI-E is found - "
1655 "vid/did=%x/%x\n", venderid, deviceid);
1646 } else if (deviceid == RTL_PCI_8192CET_DID || 1656 } else if (deviceid == RTL_PCI_8192CET_DID ||
1647 deviceid == RTL_PCI_8192CE_DID || 1657 deviceid == RTL_PCI_8192CE_DID ||
1648 deviceid == RTL_PCI_8191CE_DID || 1658 deviceid == RTL_PCI_8191CE_DID ||