In case driver already set info->flags (eg. IEEE80211_TX_CTL_NO_CCK_RATE in ath9k driver), before this patch we skip this requested flags. Signed-off-by: Janusz Dziedzic <janusz.dziedzic@xxxxxxxxx> --- net/mac80211/tx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index a512c4b..6ea1c65 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1532,6 +1532,7 @@ bool ieee80211_tx_prepare_skb(struct ieee80211_hw *hw, struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_data tx; struct sk_buff *skb2; + unsigned int flags = info->flags; if (ieee80211_tx_prepare(sdata, &tx, NULL, skb) == TX_DROP) return false; @@ -1539,6 +1540,7 @@ bool ieee80211_tx_prepare_skb(struct ieee80211_hw *hw, info->band = band; info->control.vif = vif; info->hw_queue = vif->hw_queue[skb_get_queue_mapping(skb)]; + info->flags |= flags; if (invoke_tx_handlers(&tx)) return false; -- 1.9.1 -- 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
