Skip to content

Commit

Permalink
mac80211: fix crash with single-queue drivers
Browse files Browse the repository at this point in the history
Larry (and some others I think) reported that with
single-queue drivers mac80211 crashes when waking
the queues. This happens because we allocate just
a single queue for each virtual interface in case
the driver doesn't have at least 4 queues, but the
code stopping/waking the virtual interface queues
wasn't taking this into account.

Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jul 6, 2012
1 parent c620948 commit a6f38ac
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions net/mac80211/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,10 @@ EXPORT_SYMBOL(ieee80211_ctstoself_duration);
void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue)
{
struct ieee80211_sub_if_data *sdata;
int n_acs = IEEE80211_NUM_ACS;

if (local->hw.queues < IEEE80211_NUM_ACS)
n_acs = 1;

list_for_each_entry_rcu(sdata, &local->interfaces, list) {
int ac;
Expand All @@ -279,7 +283,7 @@ void ieee80211_propagate_queue_wake(struct ieee80211_local *local, int queue)
local->queue_stop_reasons[sdata->vif.cab_queue] != 0)
continue;

for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
for (ac = 0; ac < n_acs; ac++) {
int ac_queue = sdata->vif.hw_queue[ac];

if (ac_queue == queue ||
Expand Down Expand Up @@ -341,6 +345,7 @@ static void __ieee80211_stop_queue(struct ieee80211_hw *hw, int queue,
{
struct ieee80211_local *local = hw_to_local(hw);
struct ieee80211_sub_if_data *sdata;
int n_acs = IEEE80211_NUM_ACS;

trace_stop_queue(local, queue, reason);

Expand All @@ -352,11 +357,14 @@ static void __ieee80211_stop_queue(struct ieee80211_hw *hw, int queue,

__set_bit(reason, &local->queue_stop_reasons[queue]);

if (local->hw.queues < IEEE80211_NUM_ACS)
n_acs = 1;

rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
int ac;

for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) {
for (ac = 0; ac < n_acs; ac++) {
if (sdata->vif.hw_queue[ac] == queue ||
sdata->vif.cab_queue == queue)
netif_stop_subqueue(sdata->dev, ac);
Expand Down

0 comments on commit a6f38ac

Please sign in to comment.