Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f015453 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: <chaoming_li@realsil.com.cn>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a2905935

drivers/net/wireless/rtlwifi/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ rtlwifi-objs := \ 
		efuse.o		\

		ps.o		\

		rc.o		\

		regd.o

		regd.o		\

		stats.o



rtl8192c_common-objs +=		\
@@ -24,5 +25,6 @@ obj-$(CONFIG_RTL8192CE) += rtl8192ce/ 
obj-$(CONFIG_RTL8192CU)		+= rtl8192cu/

obj-$(CONFIG_RTL8192SE)		+= rtl8192se/

obj-$(CONFIG_RTL8192DE)		+= rtl8192de/

obj-$(CONFIG_RTL8723AE)		+= rtl8723ae/



ccflags-y += -D__CHECK_ENDIAN__

drivers/net/wireless/rtlwifi/base.c

+24 −0
Original line number Diff line number Diff line
@@ -826,6 +826,30 @@ int rtlwifi_rate_mapping(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL(rtlwifi_rate_mapping);



bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb)

{

	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	__le16 fc = rtl_get_fc(skb);



	if (rtlpriv->dm.supp_phymode_switch &&

	    mac->link_state < MAC80211_LINKED &&

	    (ieee80211_is_auth(fc) || ieee80211_is_probe_req(fc))) {

		if (rtlpriv->cfg->ops->check_switch_to_dmdp)

			rtlpriv->cfg->ops->check_switch_to_dmdp(hw);

	}

	if (ieee80211_is_auth(fc)) {

		RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");

		rtl_ips_nic_on(hw);



		mac->link_state = MAC80211_LINKING;

		/* Dual mac */

		rtlpriv->phy.need_iqk = true;

	}



	return true;

}



void rtl_get_tcb_desc(struct ieee80211_hw *hw,

		      struct ieee80211_tx_info *info,

		      struct ieee80211_sta *sta,

drivers/net/wireless/rtlwifi/base.h

+2 −0
Original line number Diff line number Diff line
@@ -142,4 +142,6 @@ u8 rtl_tid_to_ac(u8 tid); 
extern struct attribute_group rtl_attribute_group;

int rtlwifi_rate_mapping(struct ieee80211_hw *hw,

			 bool isht, u8 desc_rate, bool first_ampdu);

bool rtl_tx_mgmt_proc(struct ieee80211_hw *hw, struct sk_buff *skb);



#endif

drivers/net/wireless/rtlwifi/pci.c

+15 −5
Original line number Diff line number Diff line
@@ -1309,6 +1309,7 @@ static bool rtl_pci_tx_chk_waitq_insert(struct ieee80211_hw *hw, 
	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_sta_info *sta_entry = NULL;

	u8 tid = rtl_get_tid(skb);

	__le16 fc = rtl_get_fc(skb);



	if (!sta)

		return false;
@@ -1316,6 +1317,12 @@ static bool rtl_pci_tx_chk_waitq_insert(struct ieee80211_hw *hw, 


	if (!rtlpriv->rtlhal.earlymode_enable)

		return false;

	if (ieee80211_is_nullfunc(fc))

		return false;

	if (ieee80211_is_qos_nullfunc(fc))

		return false;

	if (ieee80211_is_pspoll(fc))

		return false;

	if (sta_entry->tids[tid].agg.agg_state != RTL_AGG_OPERATIONAL)

		return false;

	if (_rtl_mac_to_hwqueue(hw, skb) > VO_QUEUE)
@@ -1357,10 +1364,8 @@ static int rtl_pci_tx(struct ieee80211_hw *hw, 
	u8 own;

	u8 temp_one = 1;



	if (ieee80211_is_auth(fc)) {

		RT_TRACE(rtlpriv, COMP_SEND, DBG_DMESG, "MAC80211_LINKING\n");

		rtl_ips_nic_on(hw);

	}

	if (ieee80211_is_mgmt(fc))

		rtl_tx_mgmt_proc(hw, skb);



	if (rtlpriv->psc.sw_ps_enabled) {

		if (ieee80211_is_data(fc) && !ieee80211_is_nullfunc(fc) &&
@@ -1628,7 +1633,7 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev, 
				 "8192 PCI-E is found - vid/did=%x/%x\n",

				 venderid, deviceid);

			rtlhal->hw_type = HARDWARE_TYPE_RTL8192E;

			break;

			return false;

		case RTL_PCI_REVISION_ID_8192SE:

			RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

				 "8192SE is found - vid/did=%x/%x\n",
@@ -1643,6 +1648,11 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev, 
			break;



		}

	} else if (deviceid == RTL_PCI_8723AE_DID) {

		rtlhal->hw_type = HARDWARE_TYPE_RTL8723AE;

		RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

			 "8723AE PCI-E is found - "

			 "vid/did=%x/%x\n", venderid, deviceid);

	} else if (deviceid == RTL_PCI_8192CET_DID ||

		   deviceid == RTL_PCI_8192CE_DID ||

		   deviceid == RTL_PCI_8191CE_DID ||

drivers/net/wireless/rtlwifi/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ 
#define RTL_PCI_8173_DID	0x8173	/*8191 SE Crab */

#define RTL_PCI_8172_DID	0x8172	/*8191 SE RE */

#define RTL_PCI_8171_DID	0x8171	/*8191 SE Unicron */

#define RTL_PCI_8723AE_DID	0x8723	/*8723AE */

#define RTL_PCI_0045_DID	0x0045	/*8190 PCI for Ceraga */

#define RTL_PCI_0046_DID	0x0046	/*8190 Cardbus for Ceraga */

#define RTL_PCI_0044_DID	0x0044	/*8192e PCIE for Ceraga */