From: Ivo van Doorn Date: Sat, 7 Jun 2008 10:29:05 +0000 (+0200) Subject: rt2x00: Clear IEEE80211_TX_CTL_USE_RTS_CTS flag for RTS frame X-Git-Tag: v2.6.27-rc1~969^2~324^2~65 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=58b642ec8961ce76991331a67a356d96a8e45c69;p=linux-2.6-omap-h63xx.git rt2x00: Clear IEEE80211_TX_CTL_USE_RTS_CTS flag for RTS frame For RTS/CTS-to-self frames the IEEE80211_TX_CTL_USE_RTS_CTS flag should be cleared for the tx_info flags. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 59f273bf5b5..c90992f613f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -64,6 +64,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev, memcpy(skb->cb, frag_skb->cb, sizeof(skb->cb)); rts_info = IEEE80211_SKB_CB(skb); rts_info->flags |= IEEE80211_TX_CTL_DO_NOT_ENCRYPT; + rts_info->flags &= ~IEEE80211_TX_CTL_USE_RTS_CTS; rts_info->flags &= ~IEEE80211_TX_CTL_USE_CTS_PROTECT; rts_info->flags &= ~IEEE80211_TX_CTL_REQ_TX_STATUS;