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

Commit fb4ea054 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: change ieee80211_rx_reorder_ready() arguments 



Clean up ieee80211_rx_reorder_ready() callers by passing the RX
TID struct and the index, instead of the frames list. This will
make it more extensible as well.

While at it, move the inline to rx.c as it's only used there.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f2ac7e30

net/mac80211/ieee80211_i.h

+0 −14
Original line number Original line Diff line number Diff line
@@ -1838,20 +1838,6 @@ static inline void ieee802_11_parse_elems(const u8 *start, size_t len, 
	ieee802_11_parse_elems_crc(start, len, action, elems, 0, 0);

	ieee802_11_parse_elems_crc(start, len, action, elems, 0, 0);

}

}





static inline bool ieee80211_rx_reorder_ready(struct sk_buff_head *frames)

{

	struct sk_buff *tail = skb_peek_tail(frames);

	struct ieee80211_rx_status *status;



	if (!tail)

		return false;



	status = IEEE80211_SKB_RXCB(tail);

	if (status->flag & RX_FLAG_AMSDU_MORE)

		return false;



	return true;

}





extern const int ieee802_1d_to_ac[8];

extern const int ieee802_1d_to_ac[8];

net/mac80211/rx.c

+24 −9
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Copyright 2006-2007	Jiri Benc <jbenc@suse.cz>

 * Copyright 2006-2007	Jiri Benc <jbenc@suse.cz>

 * Copyright 2007-2010	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2007-2010	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2016 Intel Deutschland GmbH

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * it under the terms of the GNU General Public License version 2 as
@@ -798,6 +799,23 @@ static ieee80211_rx_result ieee80211_rx_mesh_check(struct ieee80211_rx_data *rx) 
	return RX_CONTINUE;

	return RX_CONTINUE;

}

}





static inline bool ieee80211_rx_reorder_ready(struct tid_ampdu_rx *tid_agg_rx,

					      int index)

{

	struct sk_buff_head *frames = &tid_agg_rx->reorder_buf[index];

	struct sk_buff *tail = skb_peek_tail(frames);

	struct ieee80211_rx_status *status;



	if (!tail)

		return false;



	status = IEEE80211_SKB_RXCB(tail);

	if (status->flag & RX_FLAG_AMSDU_MORE)

		return false;



	return true;

}



static void ieee80211_release_reorder_frame(struct ieee80211_sub_if_data *sdata,

static void ieee80211_release_reorder_frame(struct ieee80211_sub_if_data *sdata,

					    struct tid_ampdu_rx *tid_agg_rx,

					    struct tid_ampdu_rx *tid_agg_rx,

					    int index,

					    int index,
@@ -812,7 +830,7 @@ static void ieee80211_release_reorder_frame(struct ieee80211_sub_if_data *sdata, 
	if (skb_queue_empty(skb_list))

	if (skb_queue_empty(skb_list))

		goto no_frame;

		goto no_frame;





	if (!ieee80211_rx_reorder_ready(skb_list)) {

	if (!ieee80211_rx_reorder_ready(tid_agg_rx, index)) {

		__skb_queue_purge(skb_list);

		__skb_queue_purge(skb_list);

		goto no_frame;

		goto no_frame;

	}

	}
@@ -866,7 +884,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata, 




	/* release the buffer until next missing frame */

	/* release the buffer until next missing frame */

	index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;

	index = tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;

	if (!ieee80211_rx_reorder_ready(&tid_agg_rx->reorder_buf[index]) &&

	if (!ieee80211_rx_reorder_ready(tid_agg_rx, index) &&

	    tid_agg_rx->stored_mpdu_num) {

	    tid_agg_rx->stored_mpdu_num) {

		/*

		/*

		 * No buffers ready to be released, but check whether any

		 * No buffers ready to be released, but check whether any
@@ -875,8 +893,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata, 
		int skipped = 1;

		int skipped = 1;

		for (j = (index + 1) % tid_agg_rx->buf_size; j != index;

		for (j = (index + 1) % tid_agg_rx->buf_size; j != index;

		     j = (j + 1) % tid_agg_rx->buf_size) {

		     j = (j + 1) % tid_agg_rx->buf_size) {

			if (!ieee80211_rx_reorder_ready(

			if (!ieee80211_rx_reorder_ready(tid_agg_rx, j)) {

					&tid_agg_rx->reorder_buf[j])) {

				skipped++;

				skipped++;

				continue;

				continue;

			}

			}
@@ -903,8 +920,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata, 
				 skipped) & IEEE80211_SN_MASK;

				 skipped) & IEEE80211_SN_MASK;

			skipped = 0;

			skipped = 0;

		}

		}

	} else while (ieee80211_rx_reorder_ready(

	} else while (ieee80211_rx_reorder_ready(tid_agg_rx, index)) {

				&tid_agg_rx->reorder_buf[index])) {

		ieee80211_release_reorder_frame(sdata, tid_agg_rx, index,

		ieee80211_release_reorder_frame(sdata, tid_agg_rx, index,

						frames);

						frames);

		index =	tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;

		index =	tid_agg_rx->head_seq_num % tid_agg_rx->buf_size;
@@ -915,8 +931,7 @@ static void ieee80211_sta_reorder_release(struct ieee80211_sub_if_data *sdata, 




		for (; j != (index - 1) % tid_agg_rx->buf_size;

		for (; j != (index - 1) % tid_agg_rx->buf_size;

		     j = (j + 1) % tid_agg_rx->buf_size) {

		     j = (j + 1) % tid_agg_rx->buf_size) {

			if (ieee80211_rx_reorder_ready(

			if (ieee80211_rx_reorder_ready(tid_agg_rx, j))

					&tid_agg_rx->reorder_buf[j]))

				break;

				break;

		}

		}
@@ -987,7 +1002,7 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_sub_if_data *sdata 
	index = mpdu_seq_num % tid_agg_rx->buf_size;

	index = mpdu_seq_num % tid_agg_rx->buf_size;





	/* check if we already stored this frame */

	/* check if we already stored this frame */

	if (ieee80211_rx_reorder_ready(&tid_agg_rx->reorder_buf[index])) {

	if (ieee80211_rx_reorder_ready(tid_agg_rx, index)) {

		dev_kfree_skb(skb);

		dev_kfree_skb(skb);

		goto out;

		goto out;

	}

	}