diff options
author | Johannes Berg <johannes.berg@intel.com> | 2011-09-29 10:04:30 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-30 15:57:13 -0400 |
commit | b0b97a8ad5c4640785f9a1c8e979f1c0fba147e1 (patch) | |
tree | 7cd00e44ca83c0864dc3515a72e5d8d069da32c9 /net/mac80211 | |
parent | 948d887dec1042a7d78ae311908113e26502062f (diff) |
mac80211: remove return value from add_pending_skbs
Now that we no longer use the return value, we no
longer need to maintain it either, so remove it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 10 | ||||
-rw-r--r-- | net/mac80211/util.c | 17 |
2 files changed, 12 insertions, 15 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 5cadcbbc9a57..674b23ea14d7 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -1303,11 +1303,11 @@ void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue, | |||
1303 | enum queue_stop_reason reason); | 1303 | enum queue_stop_reason reason); |
1304 | void ieee80211_add_pending_skb(struct ieee80211_local *local, | 1304 | void ieee80211_add_pending_skb(struct ieee80211_local *local, |
1305 | struct sk_buff *skb); | 1305 | struct sk_buff *skb); |
1306 | int ieee80211_add_pending_skbs(struct ieee80211_local *local, | 1306 | void ieee80211_add_pending_skbs(struct ieee80211_local *local, |
1307 | struct sk_buff_head *skbs); | 1307 | struct sk_buff_head *skbs); |
1308 | int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, | 1308 | void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, |
1309 | struct sk_buff_head *skbs, | 1309 | struct sk_buff_head *skbs, |
1310 | void (*fn)(void *data), void *data); | 1310 | void (*fn)(void *data), void *data); |
1311 | 1311 | ||
1312 | void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, | 1312 | void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata, |
1313 | u16 transaction, u16 auth_alg, | 1313 | u16 transaction, u16 auth_alg, |
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 9d4f14621bb0..60dc600ab65b 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -367,14 +367,14 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local, | |||
367 | spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); | 367 | spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); |
368 | } | 368 | } |
369 | 369 | ||
370 | int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, | 370 | void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, |
371 | struct sk_buff_head *skbs, | 371 | struct sk_buff_head *skbs, |
372 | void (*fn)(void *data), void *data) | 372 | void (*fn)(void *data), void *data) |
373 | { | 373 | { |
374 | struct ieee80211_hw *hw = &local->hw; | 374 | struct ieee80211_hw *hw = &local->hw; |
375 | struct sk_buff *skb; | 375 | struct sk_buff *skb; |
376 | unsigned long flags; | 376 | unsigned long flags; |
377 | int queue, ret = 0, i; | 377 | int queue, i; |
378 | 378 | ||
379 | spin_lock_irqsave(&local->queue_stop_reason_lock, flags); | 379 | spin_lock_irqsave(&local->queue_stop_reason_lock, flags); |
380 | for (i = 0; i < hw->queues; i++) | 380 | for (i = 0; i < hw->queues; i++) |
@@ -389,7 +389,6 @@ int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, | |||
389 | continue; | 389 | continue; |
390 | } | 390 | } |
391 | 391 | ||
392 | ret++; | ||
393 | queue = skb_get_queue_mapping(skb); | 392 | queue = skb_get_queue_mapping(skb); |
394 | __skb_queue_tail(&local->pending[queue], skb); | 393 | __skb_queue_tail(&local->pending[queue], skb); |
395 | } | 394 | } |
@@ -401,14 +400,12 @@ int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, | |||
401 | __ieee80211_wake_queue(hw, i, | 400 | __ieee80211_wake_queue(hw, i, |
402 | IEEE80211_QUEUE_STOP_REASON_SKB_ADD); | 401 | IEEE80211_QUEUE_STOP_REASON_SKB_ADD); |
403 | spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); | 402 | spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); |
404 | |||
405 | return ret; | ||
406 | } | 403 | } |
407 | 404 | ||
408 | int ieee80211_add_pending_skbs(struct ieee80211_local *local, | 405 | void ieee80211_add_pending_skbs(struct ieee80211_local *local, |
409 | struct sk_buff_head *skbs) | 406 | struct sk_buff_head *skbs) |
410 | { | 407 | { |
411 | return ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL); | 408 | ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL); |
412 | } | 409 | } |
413 | 410 | ||
414 | void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw, | 411 | void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw, |