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

Commit bc192f89 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

mac80211: do not pass AP VLAN vif pointers to drivers 



This fixes frequent WARN_ONs when using AP VLAN + aggregation, as these vifs
are virtual and not registered with drivers.
Use sta_info_get_bss instead of sta_info_get in aggregation callbacks, so
that these callbacks can find the station entry when called with the AP vif.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5ccc32ff

net/mac80211/agg-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap, 
	int i;



	rcu_read_lock();

	sta = sta_info_get(sdata, addr);

	sta = sta_info_get_bss(sdata, addr);

	if (!sta) {

		rcu_read_unlock();

		return;

net/mac80211/agg-tx.c

+2 −2
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) 
	}



	mutex_lock(&local->sta_mtx);

	sta = sta_info_get(sdata, ra);

	sta = sta_info_get_bss(sdata, ra);

	if (!sta) {

		mutex_unlock(&local->sta_mtx);

#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -684,7 +684,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) 


	mutex_lock(&local->sta_mtx);



	sta = sta_info_get(sdata, ra);

	sta = sta_info_get_bss(sdata, ra);

	if (!sta) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Could not find station: %pM\n", ra);

net/mac80211/driver-ops.h

+14 −0
Original line number Diff line number Diff line
@@ -10,6 +10,16 @@ static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata) 
	WARN_ON(!(sdata->flags & IEEE80211_SDATA_IN_DRIVER));

}



static inline struct ieee80211_sub_if_data *

get_bss_sdata(struct ieee80211_sub_if_data *sdata)

{

	if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

		sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,

				     u.ap);



	return sdata;

}



static inline void drv_tx(struct ieee80211_local *local, struct sk_buff *skb)

{

	local->ops->tx(&local->hw, skb);
@@ -421,6 +431,7 @@ static inline void drv_sta_notify(struct ieee80211_local *local, 
				  enum sta_notify_cmd cmd,

				  struct ieee80211_sta *sta)

{

	sdata = get_bss_sdata(sdata);

	check_sdata_in_driver(sdata);



	trace_drv_sta_notify(local, sdata, cmd, sta);
@@ -437,6 +448,7 @@ static inline int drv_sta_add(struct ieee80211_local *local, 


	might_sleep();



	sdata = get_bss_sdata(sdata);

	check_sdata_in_driver(sdata);



	trace_drv_sta_add(local, sdata, sta);
@@ -454,6 +466,7 @@ static inline void drv_sta_remove(struct ieee80211_local *local, 
{

	might_sleep();



	sdata = get_bss_sdata(sdata);

	check_sdata_in_driver(sdata);



	trace_drv_sta_remove(local, sdata, sta);
@@ -547,6 +560,7 @@ static inline int drv_ampdu_action(struct ieee80211_local *local, 


	might_sleep();



	sdata = get_bss_sdata(sdata);

	check_sdata_in_driver(sdata);



	trace_drv_ampdu_action(local, sdata, action, sta, tid, ssn, buf_size);

net/mac80211/sta_info.c

+0 −4
Original line number Diff line number Diff line
@@ -351,10 +351,6 @@ static int sta_info_finish_insert(struct sta_info *sta, 


	if (!sta->dummy || dummy_reinsert) {

		/* notify driver */

		if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)

			sdata = container_of(sdata->bss,

					     struct ieee80211_sub_if_data,

					     u.ap);

		err = drv_sta_add(local, sdata, &sta->sta);

		if (err) {

			if (!async)