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

Commit 14fc4235 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: Remove test of is_broadcast with is_multicast 



A broadcast packet is a multicast packet, no need to test twice.

Reorder one defective test in rtl_core of is_multi_ether_addr
before is_broadcast_ether_addr as the is_multi returns true for
broadcast frames.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82a74d4a

drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c

+1 −4
Original line number Diff line number Diff line
@@ -413,10 +413,7 @@ int ieee80211_rtl_xmit(struct sk_buff *skb, 


		/* Determine fragmentation size based on destination (multicast

		* and broadcast are not fragmented) */

//		if (is_multicast_ether_addr(dest) ||

//		is_broadcast_ether_addr(dest)) {

		if (is_multicast_ether_addr(header.addr1) ||

		is_broadcast_ether_addr(header.addr1)) {

		if (is_multicast_ether_addr(header.addr1)) {

			frag_size = MAX_FRAG_THRESHOLD;

			qos_ctl = QOS_CTL_NOTCONTAIN_ACK;

		}

drivers/staging/rtl8187se/r8180_core.c

+1 −2
Original line number Diff line number Diff line
@@ -2003,8 +2003,7 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, 
	}



		memcpy(&dest, frag_hdr->addr1, ETH_ALEN);

		if (is_multicast_ether_addr(dest) ||

				is_broadcast_ether_addr(dest)) {

		if (is_multicast_ether_addr(dest)) {

			Duration = 0;

			RtsDur = 0;

			bRTSEnable = 0;

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+4 −5
Original line number Diff line number Diff line
@@ -2024,10 +2024,10 @@ short rtl8192_tx(struct net_device *dev, struct sk_buff *skb) 
	stype = WLAN_FC_GET_STYPE(fc);

	pda_addr = header->addr1;



	if (is_multicast_ether_addr(pda_addr))

		multi_addr = true;

	else if (is_broadcast_ether_addr(pda_addr))

	if (is_broadcast_ether_addr(pda_addr))

		broad_addr = true;

	else if (is_multicast_ether_addr(pda_addr))

		multi_addr = true;

	else

		uni_addr = true;
@@ -2358,8 +2358,7 @@ static void rtl8192_rx_normal(struct net_device *dev) 
				stats.RxBufShift);

			skb_trim(skb, skb->len - 4/*sCrcLng*/);

			rtllib_hdr = (struct rtllib_hdr_1addr *)skb->data;

			if (!is_broadcast_ether_addr(rtllib_hdr->addr1) &&

			!is_multicast_ether_addr(rtllib_hdr->addr1)) {

			if (!is_multicast_ether_addr(rtllib_hdr->addr1)) {

				/* unicast packet */

				unicast_packet = true;

			}

drivers/staging/rtl8192e/rtl819x_TSProc.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, 
	   u8 *Addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs)

{

	u8	UP = 0;

	if (is_broadcast_ether_addr(Addr) || is_multicast_ether_addr(Addr)) {

	if (is_multicast_ether_addr(Addr)) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "ERR! get TS for Broadcast or "

			     "Multicast\n");

		return false;

drivers/staging/rtl8192e/rtllib_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc, 
			return -1;



		/* {broad,multi}cast packets to our BSS go through */

		if (is_multicast_ether_addr(dst) || is_broadcast_ether_addr(dst)) {

		if (is_multicast_ether_addr(dst)) {

			if (memcmp(bssid, ieee->current_network.bssid, ETH_ALEN))

				return -1;

		}
@@ -1269,7 +1269,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, 
	sc = le16_to_cpu(hdr->seq_ctl);



	/*Filter pkt not to me*/

	multicast = is_multicast_ether_addr(hdr->addr1)|is_broadcast_ether_addr(hdr->addr1);

	multicast = is_multicast_ether_addr(hdr->addr1);

	unicast = !multicast;

	if (unicast && (compare_ether_addr(dev->dev_addr, hdr->addr1) != 0)) {

		if (ieee->bNetPromiscuousMode)
@@ -1350,7 +1350,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb, 
	/* Get TS for Rx Reorder  */

	hdr = (struct rtllib_hdr_4addr *) skb->data;

	if (ieee->current_network.qos_data.active && IsQoSDataFrame(skb->data)

		&& !is_multicast_ether_addr(hdr->addr1) && !is_broadcast_ether_addr(hdr->addr1)

		&& !is_multicast_ether_addr(hdr->addr1)

		&& (!bToOtherSTA)) {

		TID = Frame_QoSTID(skb->data);

		SeqNum = WLAN_GET_SEQ_SEQ(sc);