Commit 42f9bcfc authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove unsupported mode IW_MODE_MESH 



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_MESH 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_MESH.

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


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

drivers/staging/rtl8192e/rtllib.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -89,10 +89,6 @@ static inline void *netdev_priv_rsl(struct net_device *dev) 
#define HIGH_QUEUE			     7

#define HIGH_QUEUE			     7

#define BEACON_QUEUE			   8

#define BEACON_QUEUE			   8





#ifndef IW_MODE_MESH

#define IW_MODE_MESH			7

#endif



#define IE_CISCO_FLAG_POSITION		0x08

#define IE_CISCO_FLAG_POSITION		0x08

#define SUPPORT_CKIP_MIC			0x08

#define SUPPORT_CKIP_MIC			0x08

#define SUPPORT_CKIP_PK			0x10

#define SUPPORT_CKIP_PK			0x10

drivers/staging/rtl8192e/rtllib_rx.c

+8 −12
Original line number Original line Diff line number Diff line
@@ -1013,7 +1013,6 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, 
		}

		}

	}

	}





	if (ieee->iw_mode != IW_MODE_MESH) {

	/* packets from our adapter are dropped (echo) */

	/* packets from our adapter are dropped (echo) */

	if (!memcmp(src, ieee->dev->dev_addr, ETH_ALEN))

	if (!memcmp(src, ieee->dev->dev_addr, ETH_ALEN))

		return -1;

		return -1;
@@ -1024,7 +1023,6 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, 
			   ETH_ALEN))

			   ETH_ALEN))

			return -1;

			return -1;

	}

	}

	}

	return 0;

	return 0;

}

}
@@ -1499,8 +1497,6 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_buff *skb, 
	case IW_MODE_MONITOR:

	case IW_MODE_MONITOR:

		ret = rtllib_rx_Monitor(ieee, skb, rx_stats);

		ret = rtllib_rx_Monitor(ieee, skb, rx_stats);

		break;

		break;

	case IW_MODE_MESH:

		break;

	default:

	default:

		netdev_info(ieee->dev, "%s: ERR iw mode!!!\n", __func__);

		netdev_info(ieee->dev, "%s: ERR iw mode!!!\n", __func__);

		break;

		break;