Unverified Commit 4be8bc3f authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9617 mac80211: track only QoS data frames for admission control 

Merge Pull Request from: @ci-robot 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/BAKOTCVMFE4KOINNXG73MPZVYEGGX4CF/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SH2 
 
Link:https://gitee.com/openeuler/kernel/pulls/9617

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents b09bb273 ee7a1e44

net/mac80211/mlme.c

+10 −3
Original line number Diff line number Diff line
@@ -2346,11 +2346,18 @@ static void ieee80211_sta_tx_wmm_ac_notify(struct ieee80211_sub_if_data *sdata, 
					   u16 tx_time)

{

	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;

	u16 tid = ieee80211_get_tid(hdr);

	int ac = ieee80211_ac_from_tid(tid);

	struct ieee80211_sta_tx_tspec *tx_tspec = &ifmgd->tx_tspec[ac];

	u16 tid;

	int ac;

	struct ieee80211_sta_tx_tspec *tx_tspec;

	unsigned long now = jiffies;



	if (!ieee80211_is_data_qos(hdr->frame_control))

		return;



	tid = ieee80211_get_tid(hdr);

	ac = ieee80211_ac_from_tid(tid);

	tx_tspec = &ifmgd->tx_tspec[ac];



	if (likely(!tx_tspec->admitted_time))

		return;