diff options
| author | Ilan Peer <ilan.peer@intel.com> | 2012-08-21 12:43:35 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-04 14:16:41 +0200 |
| commit | 0ef24e528f27683620d78c3393b3df73d804828c (patch) | |
| tree | 72f1ff58ab9a24e9822a60bf6b0d747d4672687d | |
| parent | aba4e6fff8de0c92e53f0e7ef077231e75f7d760 (diff) | |
| download | linux-stable-0ef24e528f27683620d78c3393b3df73d804828c.tar.gz linux-stable-0ef24e528f27683620d78c3393b3df73d804828c.tar.bz2 linux-stable-0ef24e528f27683620d78c3393b3df73d804828c.zip | |
mac80211: Do not check for valid hw_queues for P2P_DEVICE
A P2P Device interface does not have a netdev, and is not
expected to be used for transmitting data, so there is no
need to assign hw queues for it.
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/iface.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 59f8adc2aa5f..d747da541747 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -278,13 +278,15 @@ static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata) int n_queues = sdata->local->hw.queues; int i; - for (i = 0; i < IEEE80211_NUM_ACS; i++) { - if (WARN_ON_ONCE(sdata->vif.hw_queue[i] == - IEEE80211_INVAL_HW_QUEUE)) - return -EINVAL; - if (WARN_ON_ONCE(sdata->vif.hw_queue[i] >= - n_queues)) - return -EINVAL; + if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE) { + for (i = 0; i < IEEE80211_NUM_ACS; i++) { + if (WARN_ON_ONCE(sdata->vif.hw_queue[i] == + IEEE80211_INVAL_HW_QUEUE)) + return -EINVAL; + if (WARN_ON_ONCE(sdata->vif.hw_queue[i] >= + n_queues)) + return -EINVAL; + } } if ((sdata->vif.type != NL80211_IFTYPE_AP) || |