diff options
author | Ilan Peer <ilan.peer@intel.com> | 2012-08-21 05:43:35 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-09-04 08:16:41 -0400 |
commit | 0ef24e528f27683620d78c3393b3df73d804828c (patch) | |
tree | 72f1ff58ab9a24e9822a60bf6b0d747d4672687d /net/mac80211 | |
parent | aba4e6fff8de0c92e53f0e7ef077231e75f7d760 (diff) |
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>
Diffstat (limited to 'net/mac80211')
-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) | |||
278 | int n_queues = sdata->local->hw.queues; | 278 | int n_queues = sdata->local->hw.queues; |
279 | int i; | 279 | int i; |
280 | 280 | ||
281 | for (i = 0; i < IEEE80211_NUM_ACS; i++) { | 281 | if (sdata->vif.type != NL80211_IFTYPE_P2P_DEVICE) { |
282 | if (WARN_ON_ONCE(sdata->vif.hw_queue[i] == | 282 | for (i = 0; i < IEEE80211_NUM_ACS; i++) { |
283 | IEEE80211_INVAL_HW_QUEUE)) | 283 | if (WARN_ON_ONCE(sdata->vif.hw_queue[i] == |
284 | return -EINVAL; | 284 | IEEE80211_INVAL_HW_QUEUE)) |
285 | if (WARN_ON_ONCE(sdata->vif.hw_queue[i] >= | 285 | return -EINVAL; |
286 | n_queues)) | 286 | if (WARN_ON_ONCE(sdata->vif.hw_queue[i] >= |
287 | return -EINVAL; | 287 | n_queues)) |
288 | return -EINVAL; | ||
289 | } | ||
288 | } | 290 | } |
289 | 291 | ||
290 | if ((sdata->vif.type != NL80211_IFTYPE_AP) || | 292 | if ((sdata->vif.type != NL80211_IFTYPE_AP) || |