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

Commit 182503ab authored by Harvey Harrison's avatar Harvey Harrison Committed by John W. Linville
Browse files

mac80211: rx.c use new frame control helpers 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 065e9605

net/mac80211/rx.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -2123,7 +2123,7 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, 
	struct tid_ampdu_rx *tid_agg_rx;

	struct tid_ampdu_rx *tid_agg_rx;

	u16 sc;

	u16 sc;

	u16 mpdu_seq_num;

	u16 mpdu_seq_num;

	u8 ret = 0, *qc;

	u8 ret = 0;

	int tid;

	int tid;





	sta = sta_info_get(local, hdr->addr2);

	sta = sta_info_get(local, hdr->addr2);
@@ -2135,8 +2135,7 @@ static u8 ieee80211_rx_reorder_ampdu(struct ieee80211_local *local, 
	if (!ieee80211_is_data_qos(hdr->frame_control))

	if (!ieee80211_is_data_qos(hdr->frame_control))

		goto end_reorder;

		goto end_reorder;





	qc = ieee80211_get_qos_ctl(hdr);

	tid = *ieee80211_get_qos_ctl(hdr) & QOS_CONTROL_TID_MASK;

	tid = qc[0] & QOS_CONTROL_TID_MASK;





	if (sta->ampdu_mlme.tid_state_rx[tid] != HT_AGG_STATE_OPERATIONAL)

	if (sta->ampdu_mlme.tid_state_rx[tid] != HT_AGG_STATE_OPERATIONAL)

		goto end_reorder;

		goto end_reorder;