On Mon, 2012-05-28 at 13:06 +0100, Claudio Pisa wrote: > Signed-off-by: Claudio Pisa <claudio.pisa@xxxxxxxxxxx> > --- > 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 -- 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
