2009/5/14 Gábor Stefanik <netrolller.3d@xxxxxxxxx>:
> 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: Gábor Stefanik <netrolller.3d@xxxxxxxxx>
> ---
> drivers/net/wireless/zd1211rw/zd_mac.c | 6 +++---
> drivers/net/wireless/zd1211rw/zd_mac.h | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c
> b/drivers/net/wireless/zd1211rw/zd_mac.c
> index 85c27ac..d1ec99f 100644
> --- a/drivers/net/wireless/zd1211rw/zd_mac.c
> +++ b/drivers/net/wireless/zd1211rw/zd_mac.c
> @@ -430,9 +430,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))
> diff --git a/drivers/net/wireless/zd1211rw/zd_mac.h
> b/drivers/net/wireless/zd1211rw/zd_mac.h
> index 4c05d3e..7c27591 100644
> --- a/drivers/net/wireless/zd1211rw/zd_mac.h
> +++ b/drivers/net/wireless/zd1211rw/zd_mac.h
> @@ -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
> --
> 1.5.6.3
>
>
Nah, ignore this, it got wordwrapped. (I thought Thunderbird allows
disabling word-wrap... :-( )
--
Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
