* [PATCH] mac80211: fix flag check for QoS NOACK frames
@ 2012-05-28 12:06 Claudio Pisa
2012-05-29 7:04 ` Johannes Berg
2012-05-30 19:41 ` Simon Wunderlich
0 siblings, 2 replies; 4+ messages in thread
From: Claudio Pisa @ 2012-05-28 12:06 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, johannes
Signed-off-by: Claudio Pisa <claudio.pisa@uniroma2.it>
---
net/mac80211/tx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d67d36f..cb17497 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -153,7 +153,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
/* Don't calculate ACKs for QoS Frames with NoAck Policy set */
if (ieee80211_is_data_qos(hdr->frame_control) &&
- *(ieee80211_get_qos_ctl(hdr)) | IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
+ *(ieee80211_get_qos_ctl(hdr)) & IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
dur = 0;
else
/* Time needed to transmit ACK
--
1.7.10.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] mac80211: fix flag check for QoS NOACK frames
2012-05-28 12:06 [PATCH] mac80211: fix flag check for QoS NOACK frames Claudio Pisa
@ 2012-05-29 7:04 ` Johannes Berg
2012-05-29 15:05 ` Claudio Pisa
2012-05-30 19:41 ` Simon Wunderlich
1 sibling, 1 reply; 4+ messages in thread
From: Johannes Berg @ 2012-05-29 7:04 UTC (permalink / raw)
To: Claudio Pisa; +Cc: linville, linux-wireless
On Mon, 2012-05-28 at 13:06 +0100, Claudio Pisa wrote:
> Signed-off-by: Claudio Pisa <claudio.pisa@uniroma2.it>
> ---
> net/mac80211/tx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
> index d67d36f..cb17497 100644
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -153,7 +153,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
>
> /* Don't calculate ACKs for QoS Frames with NoAck Policy set */
> if (ieee80211_is_data_qos(hdr->frame_control) &&
> - *(ieee80211_get_qos_ctl(hdr)) | IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
> + *(ieee80211_get_qos_ctl(hdr)) & IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
Looks right to me, I guess nobody cares about duration calculations
after all. How did you find this?!
johannes
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mac80211: fix flag check for QoS NOACK frames
2012-05-29 7:04 ` Johannes Berg
@ 2012-05-29 15:05 ` Claudio Pisa
0 siblings, 0 replies; 4+ messages in thread
From: Claudio Pisa @ 2012-05-29 15:05 UTC (permalink / raw)
To: Johannes Berg; +Cc: linux-wireless
On 05/29/2012 08:04 AM, Johannes Berg wrote:
> On Mon, 2012-05-28 at 13:06 +0100, Claudio Pisa wrote:
>> Signed-off-by: Claudio Pisa <claudio.pisa@uniroma2.it>
>> ---
>> net/mac80211/tx.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
>> index d67d36f..cb17497 100644
>> --- a/net/mac80211/tx.c
>> +++ b/net/mac80211/tx.c
>> @@ -153,7 +153,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
>>
>> /* Don't calculate ACKs for QoS Frames with NoAck Policy set */
>> if (ieee80211_is_data_qos(hdr->frame_control) &&
>> - *(ieee80211_get_qos_ctl(hdr)) | IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
>> + *(ieee80211_get_qos_ctl(hdr)) & IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
>
> Looks right to me, I guess nobody cares about duration calculations
> after all. How did you find this?!
Working on a project involving EDCA TXOPs and trying to find out how the
duration field is set...
cheers,
Claudio
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] mac80211: fix flag check for QoS NOACK frames
2012-05-28 12:06 [PATCH] mac80211: fix flag check for QoS NOACK frames Claudio Pisa
2012-05-29 7:04 ` Johannes Berg
@ 2012-05-30 19:41 ` Simon Wunderlich
1 sibling, 0 replies; 4+ messages in thread
From: Simon Wunderlich @ 2012-05-30 19:41 UTC (permalink / raw)
To: Claudio Pisa; +Cc: linville, linux-wireless, johannes
[-- Attachment #1: Type: text/plain, Size: 1176 bytes --]
Hey Claudio,
thanks for fixing my bugs, that was definitly wrong! :)
Acked-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Cheers,
Simon
On Mon, May 28, 2012 at 01:06:25PM +0100, Claudio Pisa wrote:
>
> Signed-off-by: Claudio Pisa <claudio.pisa@uniroma2.it>
> ---
> net/mac80211/tx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
> index d67d36f..cb17497 100644
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -153,7 +153,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx,
>
> /* Don't calculate ACKs for QoS Frames with NoAck Policy set */
> if (ieee80211_is_data_qos(hdr->frame_control) &&
> - *(ieee80211_get_qos_ctl(hdr)) | IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
> + *(ieee80211_get_qos_ctl(hdr)) & IEEE80211_QOS_CTL_ACK_POLICY_NOACK)
> dur = 0;
> else
> /* Time needed to transmit ACK
> --
> 1.7.10.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-30 19:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-28 12:06 [PATCH] mac80211: fix flag check for QoS NOACK frames Claudio Pisa
2012-05-29 7:04 ` Johannes Berg
2012-05-29 15:05 ` Claudio Pisa
2012-05-30 19:41 ` Simon Wunderlich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).