提交 13bdcd90 编写于 作者: G Gábor Stefanik 提交者: John W. Linville

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: NGábor Stefanik <netrolller.3d@gmail.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 cccaec98
...@@ -420,9 +420,9 @@ static void cs_set_control(struct zd_mac *mac, struct zd_ctrlset *cs, ...@@ -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) if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
cs->control |= ZD_CS_NEED_RANDOM_BACKOFF; cs->control |= ZD_CS_NEED_RANDOM_BACKOFF;
/* Multicast */ /* No ACK expected (multicast, etc.) */
if (is_multicast_ether_addr(header->addr1)) if (info->flags & IEEE80211_TX_CTL_NO_ACK)
cs->control |= ZD_CS_MULTICAST; cs->control |= ZD_CS_NO_ACK;
/* PS-POLL */ /* PS-POLL */
if (ieee80211_is_pspoll(header->frame_control)) if (ieee80211_is_pspoll(header->frame_control))
......
...@@ -87,7 +87,7 @@ struct zd_ctrlset { ...@@ -87,7 +87,7 @@ struct zd_ctrlset {
/* zd_ctrlset control field */ /* zd_ctrlset control field */
#define ZD_CS_NEED_RANDOM_BACKOFF 0x01 #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_FRAME_TYPE_MASK 0x0c
#define ZD_CS_DATA_FRAME 0x00 #define ZD_CS_DATA_FRAME 0x00
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册