Skip to content

Commit

Permalink
rt2x00: Clear queue entry flags during initialization
Browse files Browse the repository at this point in the history
When the queues are being initialized the entry flags fields must be
reset to 0. When this does not happen some entries might still be
marked as "occupied" after an ifdown & ifup cycle which would trigger
errors when the entry is being accessed:

	phy0 -> rt2x00queue_write_tx_frame: Error - Arrived at non-free entry in the non-full queue 0.
	Please file bug report to http://rt2x00.serialmonkey.com.

This also fixes the mac80211 warning:

	------------[ cut here ]------------
	WARNING: at net/mac80211/tx.c:1238 ieee80211_master_start_xmit+0x30a/0x350 [mac80211]()

which was triggered by the queue error.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Ivo van Doorn authored and John W. Linville committed Jul 29, 2008
1 parent 74c0ee9 commit 9c0ab71
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/net/wireless/rt2x00/rt2x00queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -492,9 +492,12 @@ void rt2x00queue_init_rx(struct rt2x00_dev *rt2x00dev)
if (!rt2x00dev->ops->lib->init_rxentry)
return;

for (i = 0; i < queue->limit; i++)
for (i = 0; i < queue->limit; i++) {
queue->entries[i].flags = 0;

rt2x00dev->ops->lib->init_rxentry(rt2x00dev,
&queue->entries[i]);
}
}

void rt2x00queue_init_tx(struct rt2x00_dev *rt2x00dev)
Expand All @@ -508,9 +511,12 @@ void rt2x00queue_init_tx(struct rt2x00_dev *rt2x00dev)
if (!rt2x00dev->ops->lib->init_txentry)
continue;

for (i = 0; i < queue->limit; i++)
for (i = 0; i < queue->limit; i++) {
queue->entries[i].flags = 0;

rt2x00dev->ops->lib->init_txentry(rt2x00dev,
&queue->entries[i]);
}
}
}

Expand Down

0 comments on commit 9c0ab71

Please sign in to comment.