Commit 2b632f7f authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove unsupported mode IW_MODE_MASTER 



Tasklet irq_rx_tasklet is scheduled when hw is receiving frames. Function
_rtl92e_irq_rx_tasklet() is then called which calls then
_rtl92e_rx_normal(). In _rtl92e_rx_normal() all frames are processed by
rtllib_rx(). When ieee->iw_mode is IW_MODE_MASTER the function returns
0. The calling function then calls: dev_kfree_skb_any() which clears the
skb. So the driver clears all packets received in this mode. Remove dead
code in mode IW_MODE_MASTER.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/9cd4574e4cfe0a2d7afce03c9b868757e215a23c.1691908402.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a832649

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+0 −4
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ static void _rtl92e_update_msr(struct net_device *dev) 
		if (priv->rtllib->link_state == MAC80211_LINKED)

			msr |= MSR_LINK_ADHOC;

		break;

	case IW_MODE_MASTER:

		if (priv->rtllib->link_state == MAC80211_LINKED)

			msr |= MSR_LINK_MASTER;

		break;

	default:

		break;

	}

drivers/staging/rtl8192e/rtl8192e/rtl_ps.c

+2 −4
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ void rtl92e_ips_enter(struct net_device *dev) 


	rt_state = priv->rtllib->rf_power_state;

	if (rt_state == rf_on && !psc->bSwRfProcessing &&

		(priv->rtllib->link_state != MAC80211_LINKED) &&

		(priv->rtllib->iw_mode != IW_MODE_MASTER)) {

		(priv->rtllib->link_state != MAC80211_LINKED)) {

		psc->eInactivePowerState = rf_off;

		_rtl92e_ps_update_rf_state(dev);

	}
@@ -210,8 +209,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) 


	if (!((priv->rtllib->iw_mode == IW_MODE_INFRA) &&

	    (priv->rtllib->link_state == MAC80211_LINKED))

	    || (priv->rtllib->iw_mode == IW_MODE_ADHOC) ||

	    (priv->rtllib->iw_mode == IW_MODE_MASTER))

	    || (priv->rtllib->iw_mode == IW_MODE_ADHOC))

		return;



	if (psc->bLeisurePs) {

drivers/staging/rtl8192e/rtl819x_HTProc.c

+1 −2
Original line number Diff line number Diff line
@@ -363,8 +363,7 @@ void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo, 
	}



	memset(posHTInfo, 0, *len);

	if ((ieee->iw_mode == IW_MODE_ADHOC) ||

	    (ieee->iw_mode == IW_MODE_MASTER)) {

	if (ieee->iw_mode == IW_MODE_ADHOC) {

		pHTInfoEle->ControlChl	= ieee->current_network.channel;

		pHTInfoEle->ExtChlOffset = ((!pHT->bRegBW40MHz) ?

					    HT_EXTCHNL_OFFSET_NO_EXT :

drivers/staging/rtl8192e/rtl819x_TSProc.c

+2 −12
Original line number Diff line number Diff line
@@ -182,15 +182,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ieee, 
	struct list_head *psearch_list;

	struct ts_common_info *pRet = NULL;



	if (ieee->iw_mode == IW_MODE_MASTER) {

		if (TxRxSelect == TX_DIR) {

			search_dir[DIR_DOWN] = true;

			search_dir[DIR_BI_DIR] = true;

		} else {

			search_dir[DIR_UP] = true;

			search_dir[DIR_BI_DIR] = true;

		}

	} else if (ieee->iw_mode == IW_MODE_ADHOC) {

	if (ieee->iw_mode == IW_MODE_ADHOC) {

		if (TxRxSelect == TX_DIR)

			search_dir[DIR_UP] = true;

		else
@@ -311,9 +303,7 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, 
				(&ieee->Tx_TS_Admit_List) :

				(&ieee->Rx_TS_Admit_List);



	Dir = (ieee->iw_mode == IW_MODE_MASTER) ?

				((TxRxSelect == TX_DIR) ? DIR_DOWN : DIR_UP) :

				((TxRxSelect == TX_DIR) ? DIR_UP : DIR_DOWN);

	Dir = ((TxRxSelect == TX_DIR) ? DIR_UP : DIR_DOWN);



	if (!list_empty(pUnusedList)) {

		(*ppTS) = list_entry(pUnusedList->next,

drivers/staging/rtl8192e/rtllib_rx.c

+1 −3
Original line number Diff line number Diff line
@@ -1496,7 +1496,6 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_buff *skb, 
	case IW_MODE_INFRA:

		ret = rtllib_rx_InfraAdhoc(ieee, skb, rx_stats);

		break;

	case IW_MODE_MASTER:

	case IW_MODE_REPEAT:

		break;

	case IW_MODE_MONITOR:
@@ -2682,8 +2681,7 @@ static void rtllib_rx_mgt(struct rtllib_device *ieee, 
		netdev_dbg(ieee->dev, "received PROBE REQUEST (%d)\n",

			   WLAN_FC_GET_STYPE(le16_to_cpu(header->frame_ctl)));

		if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&

		    ((ieee->iw_mode == IW_MODE_ADHOC ||

		    ieee->iw_mode == IW_MODE_MASTER) &&

		    (ieee->iw_mode == IW_MODE_ADHOC &&

		    ieee->link_state == MAC80211_LINKED))

			rtllib_rx_probe_rq(ieee, skb);

		break;