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

Commit 13bdcd90 authored by Gábor Stefanik's avatar Gábor Stefanik Committed by John W. Linville
Browse files

zd1211rw: Replace ZD_CS_MULTICAST with ZD_CS_NO_ACK 



According to my tests, all that ZD_CS_MULTICAST does is to
disable retrying/waiting for an ACK. Reflect this by renaming
the bit to ZD_CS_NO_ACK and setting it based on
IEEE80211_TX_CTL_NO_ACK, instead of is_multicast_ether_addr.

Signed-off-by: default avatarGábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cccaec98

drivers/net/wireless/zd1211rw/zd_mac.c

+3 −3
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs, 
	if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)

		cs->control |= ZD_CS_NEED_RANDOM_BACKOFF;



	/* Multicast */

	if (is_multicast_ether_addr(header->addr1))

		cs->control |= ZD_CS_MULTICAST;

	/* No ACK expected (multicast, etc.) */

	if (info->flags & IEEE80211_TX_CTL_NO_ACK)

		cs->control |= ZD_CS_NO_ACK;



	/* PS-POLL */

	if (ieee80211_is_pspoll(header->frame_control))

drivers/net/wireless/zd1211rw/zd_mac.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct zd_ctrlset { 


/* zd_ctrlset control field */

#define ZD_CS_NEED_RANDOM_BACKOFF	0x01

#define ZD_CS_MULTICAST			0x02

#define ZD_CS_NO_ACK			0x02



#define ZD_CS_FRAME_TYPE_MASK		0x0c

#define ZD_CS_DATA_FRAME		0x00