| Message ID | 20160808070610.20563-1-yanivma@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
On Mon, 2016-08-08 at 10:06 +0300, Yaniv Machani wrote: > From: Meirav Kama <meiravk@ti.com> > > MP received data frames from another MP. Frames are forwarded > from Rx to Tx to be transmitted to a third MP. > Upon cloning the skb, the tx_info was zeroed, and the > hw_queue wasn't set correctly, causing frames to be > inserted to queue 0 (VOICE). If re-queue occurred for some > reason, frame will be inserted to correct queue 2 (BE). > In this case frames are now dequeued from 2 different queues and > sent out of order. Uh, sorry. I was so focused on the commit message and everything that I neglected to look into the code change ... :( > info->control.jiffies = jiffies; > + info->hw_queue = q; > This is incorrect. 'q' appears to be the AC here, so you need to set something like vif->hw_queue[q], afaict? Check out tx.c where this is set. johannes -- 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
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 9a1eb70..88dc744 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2392,6 +2392,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; info->control.vif = &rx->sdata->vif; info->control.jiffies = jiffies; + info->hw_queue = q; if (is_multicast_ether_addr(fwd_hdr->addr1)) { IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, fwded_mcast); memcpy(fwd_hdr->addr2, sdata->vif.addr, ETH_ALEN);