Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (7fc94272) · Commits · e / devices / android_kernel_xiaomi_nabu

net/mac80211/tx.c

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -414,6 +414,9 @@ ieee80211_tx_h_multicast_ps_buf(struct ieee80211_tx_data *tx)
	if (ieee80211_has_order(hdr->frame_control))		if (ieee80211_has_order(hdr->frame_control))
	return TX_CONTINUE;		return TX_CONTINUE;

			if (ieee80211_is_probe_req(hdr->frame_control))
			return TX_CONTINUE;

	if (tx->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)		if (tx->local->hw.flags & IEEE80211_HW_QUEUE_CONTROL)
	info->hw_queue = tx->sdata->vif.cab_queue;		info->hw_queue = tx->sdata->vif.cab_queue;

	@@ -463,6 +466,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
	{		{
	struct sta_info *sta = tx->sta;		struct sta_info *sta = tx->sta;
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
			struct ieee80211_hdr hdr = (struct ieee80211_hdr )tx->skb->data;
	struct ieee80211_local *local = tx->local;		struct ieee80211_local *local = tx->local;

	if (unlikely(!sta))		if (unlikely(!sta))
	@@ -473,6 +477,12 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
	!(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {		!(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
	int ac = skb_get_queue_mapping(tx->skb);		int ac = skb_get_queue_mapping(tx->skb);

			if (ieee80211_is_mgmt(hdr->frame_control) &&
			!ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {
			info->flags \|= IEEE80211_TX_CTL_NO_PS_BUFFER;
			return TX_CONTINUE;
			}

	ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",		ps_dbg(sta->sdata, "STA %pM aid %d: PS buffer for AC %d\n",
	sta->sta.addr, sta->sta.aid, ac);		sta->sta.addr, sta->sta.aid, ac);
	if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)		if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
	@@ -531,19 +541,9 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
	static ieee80211_tx_result debug_noinline		static ieee80211_tx_result debug_noinline
	ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx)		ieee80211_tx_h_ps_buf(struct ieee80211_tx_data *tx)
	{		{
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb);
	struct ieee80211_hdr hdr = (struct ieee80211_hdr )tx->skb->data;

	if (unlikely(tx->flags & IEEE80211_TX_PS_BUFFERED))		if (unlikely(tx->flags & IEEE80211_TX_PS_BUFFERED))
	return TX_CONTINUE;		return TX_CONTINUE;

	if (ieee80211_is_mgmt(hdr->frame_control) &&
	!ieee80211_is_bufferable_mmpdu(hdr->frame_control)) {
	if (tx->flags & IEEE80211_TX_UNICAST)
	info->flags \|= IEEE80211_TX_CTL_NO_PS_BUFFER;
	return TX_CONTINUE;
	}

	if (tx->flags & IEEE80211_TX_UNICAST)		if (tx->flags & IEEE80211_TX_UNICAST)
	return ieee80211_tx_h_unicast_ps_buf(tx);		return ieee80211_tx_h_unicast_ps_buf(tx);
	else		else

net/wireless/trace.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2094,6 +2094,7 @@ TRACE_EVENT(cfg80211_michael_mic_failure,
	MAC_ASSIGN(addr, addr);		MAC_ASSIGN(addr, addr);
	__entry->key_type = key_type;		__entry->key_type = key_type;
	__entry->key_id = key_id;		__entry->key_id = key_id;
			if (tsc)
	memcpy(__entry->tsc, tsc, 6);		memcpy(__entry->tsc, tsc, 6);
	),		),
	TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm",		TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm",