Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0b97a8a authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 948d887d

net/mac80211/ieee80211_i.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -1303,9 +1303,9 @@ void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue, 
				    enum queue_stop_reason reason);

				    enum queue_stop_reason reason);

void ieee80211_add_pending_skb(struct ieee80211_local *local,

void ieee80211_add_pending_skb(struct ieee80211_local *local,

			       struct sk_buff *skb);

			       struct sk_buff *skb);

int ieee80211_add_pending_skbs(struct ieee80211_local *local,

void ieee80211_add_pending_skbs(struct ieee80211_local *local,

				struct sk_buff_head *skbs);

				struct sk_buff_head *skbs);

int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,

void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,

				   struct sk_buff_head *skbs,

				   struct sk_buff_head *skbs,

				   void (*fn)(void *data), void *data);

				   void (*fn)(void *data), void *data);

net/mac80211/util.c

+7 −10
Original line number Original line Diff line number Diff line
@@ -367,14 +367,14 @@ void ieee80211_add_pending_skb(struct ieee80211_local *local, 
	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);

	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);

}

}





int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,

void ieee80211_add_pending_skbs_fn(struct ieee80211_local *local,

				   struct sk_buff_head *skbs,

				   struct sk_buff_head *skbs,

				   void (*fn)(void *data), void *data)

				   void (*fn)(void *data), void *data)

{

{

	struct ieee80211_hw *hw = &local->hw;

	struct ieee80211_hw *hw = &local->hw;

	struct sk_buff *skb;

	struct sk_buff *skb;

	unsigned long flags;

	unsigned long flags;

	int queue, ret = 0, i;

	int queue, i;





	spin_lock_irqsave(&local->queue_stop_reason_lock, flags);

	spin_lock_irqsave(&local->queue_stop_reason_lock, flags);

	for (i = 0; i < hw->queues; i++)

	for (i = 0; i < hw->queues; i++)
@@ -389,7 +389,6 @@ int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, 
			continue;

			continue;

		}

		}





		ret++;

		queue = skb_get_queue_mapping(skb);

		queue = skb_get_queue_mapping(skb);

		__skb_queue_tail(&local->pending[queue], skb);

		__skb_queue_tail(&local->pending[queue], skb);

	}

	}
@@ -401,14 +400,12 @@ int ieee80211_add_pending_skbs_fn(struct ieee80211_local *local, 
		__ieee80211_wake_queue(hw, i,

		__ieee80211_wake_queue(hw, i,

			IEEE80211_QUEUE_STOP_REASON_SKB_ADD);

			IEEE80211_QUEUE_STOP_REASON_SKB_ADD);

	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);

	spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);



	return ret;

}

}





int ieee80211_add_pending_skbs(struct ieee80211_local *local,

void ieee80211_add_pending_skbs(struct ieee80211_local *local,

				struct sk_buff_head *skbs)

				struct sk_buff_head *skbs)

{

{

	return ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);

	ieee80211_add_pending_skbs_fn(local, skbs, NULL, NULL);

}

}





void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,

void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,