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

Commit c380a1fd authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents d107babc 22c4ceed

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -3518,7 +3518,7 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, 
		return -EINVAL;

	}

	band = chanctx_conf->def.chan->band;

	sta = sta_info_get(sdata, peer);

	sta = sta_info_get_bss(sdata, peer);

	if (sta) {

		qos = test_sta_flag(sta, WLAN_STA_WME);

	} else {

net/mac80211/offchannel.c

+2 −0
Original line number Diff line number Diff line
@@ -394,6 +394,8 @@ void ieee80211_sw_roc_work(struct work_struct *work) 


		if (started)

			ieee80211_start_next_roc(local);

		else if (list_empty(&local->roc_list))

			ieee80211_run_deferred_scan(local);

	}



 out_unlock:

net/mac80211/status.c

+3 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb) 
	struct ieee80211_local *local = sta->local;

	struct ieee80211_sub_if_data *sdata = sta->sdata;



	if (local->hw.flags & IEEE80211_HW_REPORTS_TX_ACK_STATUS)

		sta->last_rx = jiffies;



	if (ieee80211_is_data_qos(mgmt->frame_control)) {

		struct ieee80211_hdr *hdr = (void *) skb->data;

		u8 *qc = ieee80211_get_qos_ctl(hdr);

net/mac80211/tx.c

+2 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,8 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, 
		tx->sta = rcu_dereference(sdata->u.vlan.sta);

		if (!tx->sta && sdata->dev->ieee80211_ptr->use_4addr)

			return TX_DROP;

	} else if (info->flags & IEEE80211_TX_CTL_INJECTED ||

	} else if (info->flags & (IEEE80211_TX_CTL_INJECTED |

				  IEEE80211_TX_INTFL_NL80211_FRAME_TX) ||

		   tx->sdata->control_port_protocol == tx->skb->protocol) {

		tx->sta = sta_info_get_bss(sdata, hdr->addr1);

	}