On Mon, 2013-02-11 at 11:21 -0600, Seth Forshee wrote:
> + * @IEEE80211_TX_CTL_OFFCHAN_TX_OK: Internal to mac80211. Used to indicate
> + * that a frame can be transmitted while the queues are stopped for
> + * off-channel operation.
I'm renaming this to INTFL_ instead of CTL_, any objections? I don't
think drivers should (need to) use it.
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -1228,8 +1228,21 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local,
> #endif
>
> spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
> - if (local->queue_stop_reasons[q] ||
> - (!txpending && !skb_queue_empty(&local->pending[q]))) {
> + if (unlikely(info->flags & IEEE80211_TX_CTL_OFFCHAN_TX_OK)) {
> + /*
> + * Drop off-channel frames if queues are stopped for
> + * any reason other than off-channel operation. Never
> + * queue them.
> + */
> + if (local->queue_stop_reasons[q] &
> + ~BIT(IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL)) {
> + spin_unlock_irqrestore(&local->queue_stop_reason_lock,
> + flags);
> + ieee80211_purge_tx_queue(&local->hw, skbs);
> + return true;
> + }
> + } else if (local->queue_stop_reasons[q] ||
> + (!txpending && !skb_queue_empty(&local->pending[q]))) {
I think this bit would be better written like this:
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1230,6 +1230,21 @@ static bool ieee80211_tx_frags(struct ieee80211_local *local,
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
if (local->queue_stop_reasons[q] ||
(!txpending && !skb_queue_empty(&local->pending[q]))) {
+ if (unlikely(info->flags &
+ IEEE80211_TX_INTFL_OFFCHAN_TX_OK &&
+ local->queue_stop_reasons[q] &
+ ~BIT(IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL))) {
+ /*
+ * Drop off-channel frames if queues are stopped
+ * for any reason other than off-channel
+ * operation. Never queue them.
+ */
+ spin_unlock_irqrestore(
+ &local->queue_stop_reason_lock, flags);
+ ieee80211_purge_tx_queue(&local->hw, skbs);
+ return true;
+ }
+
/*
* Since queue is stopped, queue up frames for later
* transmission from the tx-pending tasklet when the
That would avoid hitting the fast-path as much, since the queues being
stopped is already something of a slow-path (and if they're stopped it
doesn't matter much ... packets won't go out soon anyway.)
I've made those changes, so just let me know if that seems OK, patch 2 I
also applied.
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
