rtlwifi: remove duplicate C2H definition (7aeb100b) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -892,34 +892,34 @@ void rtl92ee_c2h_content_parsing(struct ieee80211_hw *hw, u8 c2h_cmd_id,
	struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;		struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;

	switch (c2h_cmd_id) {		switch (c2h_cmd_id) {
	case C2H_8192E_DBG:		case C2H_DBG:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8723BE_DBG!!\n");		"[C2H], C2H_8723BE_DBG!!\n");
	break;		break;
	case C2H_8192E_TXBF:		case C2H_TXBF:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8192E_TXBF!!\n");		"[C2H], C2H_8192E_TXBF!!\n");
	break;		break;
	case C2H_8192E_TX_REPORT:		case C2H_TX_REPORT:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE ,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE ,
	"[C2H], C2H_8723BE_TX_REPORT!\n");		"[C2H], C2H_8723BE_TX_REPORT!\n");
	rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);		rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);
	break;		break;
	case C2H_8192E_BT_INFO:		case C2H_BT_INFO:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8723BE_BT_INFO!!\n");		"[C2H], C2H_8723BE_BT_INFO!!\n");
	if (rtlpriv->cfg->ops->get_btc_status())		if (rtlpriv->cfg->ops->get_btc_status())
	btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,		btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,
	c2h_cmd_len);		c2h_cmd_len);
	break;		break;
	case C2H_8192E_BT_MP:		case C2H_BT_MP:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8723BE_BT_MP!!\n");		"[C2H], C2H_8723BE_BT_MP!!\n");
	if (rtlpriv->cfg->ops->get_btc_status())		if (rtlpriv->cfg->ops->get_btc_status())
	btc_ops->btc_btmpinfo_notify(rtlpriv, tmp_buf,		btc_ops->btc_btmpinfo_notify(rtlpriv, tmp_buf,
	c2h_cmd_len);		c2h_cmd_len);
	break;		break;
	case C2H_8192E_RA_RPT:		case C2H_RA_RPT:
	_rtl92ee_c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);		_rtl92ee_c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);
	break;		break;
	default:		default:
	@@ -948,8 +948,8 @@ void rtl92ee_c2h_packet_handler(struct ieee80211_hw hw, u8 buffer, u8 len)
	"[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);		"[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);

	switch (c2h_cmd_id) {		switch (c2h_cmd_id) {
	case C2H_8192E_BT_INFO:		case C2H_BT_INFO:
	case C2H_8192E_BT_MP:		case C2H_BT_MP:
	rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);		rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
	break;		break;
	default:		default:

drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.h

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -128,17 +128,6 @@ enum rtl8192e_h2c_cmd {
	MAX_92E_H2CCMD		MAX_92E_H2CCMD
	};		};

	enum rtl8192e_c2h_evt {
	C2H_8192E_DBG = 0,
	C2H_8192E_LB = 1,
	C2H_8192E_TXBF = 2,
	C2H_8192E_TX_REPORT = 3,
	C2H_8192E_BT_INFO = 9,
	C2H_8192E_BT_MP = 11,
	C2H_8192E_RA_RPT = 12,
	MAX_8192E_C2HEVENT
	};

	#define pagenum_128(_len) \		#define pagenum_128(_len) \
	(u32)(((_len) >> 7) + ((_len) & 0x7F ? 1 : 0))		(u32)(((_len) >> 7) + ((_len) & 0x7F ? 1 : 0))

drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -712,23 +712,23 @@ void rtl8723be_c2h_content_parsing(struct ieee80211_hw *hw,
	struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;		struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;

	switch (c2h_cmd_id) {		switch (c2h_cmd_id) {
	case C2H_8723B_DBG:		case C2H_DBG:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8723BE_DBG!!\n");		"[C2H], C2H_8723BE_DBG!!\n");
	break;		break;
	case C2H_8723B_TX_REPORT:		case C2H_TX_REPORT:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8723BE_TX_REPORT!\n");		"[C2H], C2H_8723BE_TX_REPORT!\n");
	rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);		rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);
	break;		break;
	case C2H_8723B_BT_INFO:		case C2H_BT_INFO:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8723BE_BT_INFO!!\n");		"[C2H], C2H_8723BE_BT_INFO!!\n");
	if (rtlpriv->cfg->ops->get_btc_status())		if (rtlpriv->cfg->ops->get_btc_status())
	btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,		btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,
	c2h_cmd_len);		c2h_cmd_len);
	break;		break;
	case C2H_8723B_BT_MP:		case C2H_BT_MP:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8723BE_BT_MP!!\n");		"[C2H], C2H_8723BE_BT_MP!!\n");
	if (rtlpriv->cfg->ops->get_btc_status())		if (rtlpriv->cfg->ops->get_btc_status())
	@@ -761,8 +761,8 @@ void rtl8723be_c2h_packet_handler(struct ieee80211_hw hw, u8 buffer, u8 len)
	"[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);		"[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);

	switch (c2h_cmd_id) {		switch (c2h_cmd_id) {
	case C2H_8723B_BT_INFO:		case C2H_BT_INFO:
	case C2H_8723B_BT_MP:		case C2H_BT_MP:
	rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);		rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
	break;		break;

drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.h

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -100,16 +100,6 @@ enum rtl8723b_h2c_cmd {
	MAX_8723B_H2CCMD		MAX_8723B_H2CCMD
	};		};

	enum rtl8723b_c2h_evt {
	C2H_8723B_DBG = 0,
	C2H_8723B_LB = 1,
	C2H_8723B_TXBF = 2,
	C2H_8723B_TX_REPORT = 3,
	C2H_8723B_BT_INFO = 9,
	C2H_8723B_BT_MP = 11,
	MAX_8723B_C2HEVENT
	};

	#define pagenum_128(_len) (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))		#define pagenum_128(_len) (u32)(((_len)>>7) + ((_len)&0x7F ? 1 : 0))

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1926,23 +1926,23 @@ void rtl8821ae_c2h_content_parsing(struct ieee80211_hw *hw,
	struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;		struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;

	switch (c2h_cmd_id) {		switch (c2h_cmd_id) {
	case C2H_8812_DBG:		case C2H_DBG:
	RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_8812_DBG!!\n");		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD, "[C2H], C2H_8812_DBG!!\n");
	break;		break;
	case C2H_8812_TX_REPORT:		case C2H_TX_REPORT:
	rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);		rtl_tx_report_handler(hw, tmp_buf, c2h_cmd_len);
	break;		break;
	case C2H_8812_RA_RPT:		case C2H_RA_RPT:
	rtl8821ae_c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);		rtl8821ae_c2h_ra_report_handler(hw, tmp_buf, c2h_cmd_len);
	break;		break;
	case C2H_8812_BT_INFO:		case C2H_BT_INFO:
	RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,		RT_TRACE(rtlpriv, COMP_FW, DBG_LOUD,
	"[C2H], C2H_8812_BT_INFO!!\n");		"[C2H], C2H_8812_BT_INFO!!\n");
	if (rtlpriv->cfg->ops->get_btc_status())		if (rtlpriv->cfg->ops->get_btc_status())
	btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,		btc_ops->btc_btinfo_notify(rtlpriv, tmp_buf,
	c2h_cmd_len);		c2h_cmd_len);
	break;		break;
	case C2H_8812_BT_MP:		case C2H_BT_MP:
	RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,		RT_TRACE(rtlpriv, COMP_FW, DBG_TRACE,
	"[C2H], C2H_8812_BT_MP!!\n");		"[C2H], C2H_8812_BT_MP!!\n");
	if (rtlpriv->cfg->ops->get_btc_status())		if (rtlpriv->cfg->ops->get_btc_status())
	@@ -1974,7 +1974,7 @@ void rtl8821ae_c2h_packet_handler(struct ieee80211_hw hw, u8 buffer,
	"[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);		"[C2H packet], Content Hex:\n", tmp_buf, c2h_cmd_len);

	switch (c2h_cmd_id) {		switch (c2h_cmd_id) {
	case C2H_8812_BT_INFO:		case C2H_BT_INFO:
	rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);		rtl_c2hcmd_enqueue(hw, c2h_cmd_id, c2h_cmd_len, tmp_buf);
	break;		break;